redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* file detail design finished

Browse Source 
git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@44 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-05-16 06:58:52 +00:00
parent 917e35baac
commit ca25cfa255
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/dmsf_file_revision.rb
View File

@ -139,6 +139,10 @@ class DmsfFileRevision < ActiveRecord::Base
new_revision.source_revision = self new_revision.source_revision = self
new_revision.user = User.current new_revision.user = User.current
new_revision.name = self.name
new_revision.folder = self.folder
return new_revision return new_revision
end end

22
app/views/dmsf_detail/_file_new_revision.html.erb
View File

@ -1,5 +1,5 @@
<div class="box dmsf_detail dmsf_revision"> <div class="box dmsf_detail dmsf_revision">
<strong>Create New Revision <a href="#" id="newRevisionFormContentToggle">[-]</a></strong> <strong>New Revision <a href="#" id="newRevisionFormContentToggle">[-]</a></strong>
<div id="newRevisionFormContent"> <div id="newRevisionFormContent">
<% if @file.locked_for_user? %> <% if @file.locked_for_user? %>
<p class="warning"><%= l(:info_file_locked) %></p> <p class="warning"><%= l(:info_file_locked) %></p>
@ -38,14 +38,14 @@ form_for(:dmsf_file_revision, @revision, :url => {:action => "save_file", :id =>
<p class="no-ident"> <p class="no-ident">
<%= label_tag("dmsf_file_revision_description", "Description:") %> <%= label_tag("dmsf_file_revision_description", "Description:") %>
</p> </p>
<div class="wiki clear" style="margin-left: 110px"> <div class="wiki data clear">
<%= f.text_area(:description, :rows=> "6", :class => "wiki-edit") %> <%= f.text_area(:description, :rows=> "6", :class => "wiki-edit") %>
</div> </div>
<div class="splitcontentleft"> <div class="splitcontentleft">
<p> <p>
<%= label_tag("fileMinorVersionRadio", "Version:") %> <%= label_tag("fileMinorVersionRadio", "Version:") %>
</p> </p>
<div class="wiki clear" style="margin-left: 110px"> <div class="data clear">
<%= radio_button_tag("dmsf_file_revision[version]", "same", @revision.version == @file.last_revision.version, :id => "fileSameVersionRadio") %> <%= radio_button_tag("dmsf_file_revision[version]", "same", @revision.version == @file.last_revision.version, :id => "fileSameVersionRadio") %>
<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version %> Same<br /> <%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version %> Same<br />
<%= radio_button_tag("dmsf_file_revision[version]", "minor", <%= radio_button_tag("dmsf_file_revision[version]", "minor",
@ -65,17 +65,21 @@ form_for(:dmsf_file_revision, @revision, :url => {:action => "save_file", :id =>
<div class="splitcontentright clear"> <div class="splitcontentright clear">
<p> <p>
<%= label_tag("fileFileUpload", "New content:") %> <%= label_tag("fileFileUpload", "New content:") %>
<%= file_field_tag("dmsf_file_revision[file]", :size => 30, :id => "fileFileUpload") %> <div class="data">
<br /> <%= file_field_tag("dmsf_file_revision[file]", :size => 30, :id => "fileFileUpload") %>
<small> <br />
(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) <small>
</small> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
</small>
</div>
</p> </p>
</div> </div>
<br style="clear: both"/> <br style="clear: both"/>
<p> <p>
<%= label_tag("dmsf_file_revision_comment", "Comment:") %> <%= label_tag("dmsf_file_revision_comment", "Comment:") %>
<%= f.text_area(:comment, :rows=> "2", :style => "width: 99%;") %> <div class="data">
<%= f.text_area(:comment, :rows=> "2", :style => "width: 99%;") %>
</div>
</p> </p>
<br /> <br />
<%= submit_tag("Create") %> <%= submit_tag("Create") %>

5
app/views/dmsf_detail/file_detail.html.erb
View File

@ -72,14 +72,15 @@
<div class="splitcontentright clear"> <div class="splitcontentright clear">
<p> <p>
<%= label_tag("", "Mime:") %> <%= label_tag("", "Mime:") %>
<%= h(revision.mime_type) %> <%= h(revision.mime_type) %>&nbsp;
</p> </p>
<p> <p>
<%= label_tag("", "Size:") %> <%= label_tag("", "Size:") %>
<%= number_to_human_size(revision.size) %> <%= number_to_human_size(revision.size) %>
</p> </p>
</div> </div>
<p class="clear"> <br style="clear: both"/>
<p class="no-ident clear">
<%= label_tag("", "Comment:") %> <%= label_tag("", "Comment:") %>
<%= h(revision.comment) %> <%= h(revision.comment) %>
</p> </p>

4
assets/stylesheets/dmsf.css
View File

@ -109,6 +109,10 @@ div.right_icon_box img.detail_icon {
padding: 4px 4px 4px 30px; padding: 4px 4px 4px 30px;
} }
.dmsf_detail div.data {
margin-left: 110px;
}
.dmsf_revision label { .dmsf_revision label {
font-weight: bold; font-weight: bold;
width: 100px; width: 100px;