developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

view update

This commit is contained in:
devin 2012-12-06 11:43:40 +08:00 committed by chris
parent 1b4c76a472
commit 89e25fe7a2
7 changed files with 76 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/desktop/journal_pages.js.erb
View File

@ -136,18 +136,21 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
$.each(journalData,function(i,journal){
$.each(journal.papers,function(j,paper){
li = null;
li = $('<li class="list_t_item"></li>');
li.append('<div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div>');
li = $('<li class="list_t_item file_view"></li>');
li.append('<div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des"></div>');
var file_list = li.find('.list_t_des');
$.each(paper.files,function(k,file){
var thistitle = file.title;
if(!file.title)
thistitle = ( thistitle.length > 8 )? thistitle.substring(0,8)+'...' : thistitle;
if(!file.title){
thistitle = "Untitled File";
var img = $('<div class="list_t_des"><a href="'+file.url+'" target="_blank" ><img src="'+file.icon+'" />'+thistitle+'</a></div>');
li.append(img);
}
var img = $('<a class="file" href="'+file.url+'" target="_blank" ><img src="'+file.icon+'" /><span class="filetitle">'+thistitle+'</span></a>');
file_list.append(img);
})
li.append('<div class="list_item_function"><a class="journal_paper_edit admbg2 admtxt" href="'+paper.url_edit+'">Edit</a> <a class="journal_paper_delete admbg2 admtxt" href="'+paper.url_delete+'">Delete</a></div>');
column.find("ul").append(li);
if(counter%5==0){
if(counter%3==0){
$("#journal_p div#paper_list div.overview").append(column);
column = $('<div class="g_col list_t"><ul></ul></div>');
}

42
app/assets/stylesheets/desktopmain.css
View File

@ -720,6 +720,7 @@ a:focus { outline: none; }
padding: 4px;
font-family: Arial, sans-serif;
font-size: 11px;
-webkit-text-size-adjust: none;
}
.list_item_action a {
display: block;
@ -733,6 +734,29 @@ a:focus { outline: none; }
.list_item_action .icon-check-empty { color: #999; font-size: 20px; }
.list_item_action .icon-check { color: #333; font-size: 20px; }
#paper_list .list_t_item.file_view {
height: 148px;
}
#paper_list .file_view .file {
display: inline-block;
width: 62px;
height: 50px;
text-align: center;
}
#paper_list .file_view .file:hover {
background-color: #ddd;
}
#paper_list .file_view .file img {
width: 24px;
display: block;
margin: 0 auto;
margin-top: 4px;
}
#paper_list .file_view .filetitle {
font-size: 11px;
-webkit-text-size-adjust: none;
}
/* Journal Paper Add */
#paper_add .s_grid_con {
float: left;
@ -779,6 +803,11 @@ a:focus { outline: none; }
line-height: 20px;
margin: 1px 1px 6px 1px;
}
#journal_list .list_t_desc {
font-family: Arial, sans-serif;
font-size: 12px;
color: #999;
}
/* Journal Co-Author */
#co_author {}
@ -791,6 +820,7 @@ a:focus { outline: none; }
padding: 4px;
font-family: Arial, sans-serif;
font-size: 11px;
-webkit-text-size-adjust: none;
}
#co_author .g_col:first-child {
margin-left: 0;
@ -819,7 +849,7 @@ a:focus { outline: none; }
/* Journal Co-Author Relationship*/
#co_author_relation_table .s_grid_con {
float: left;
width: 346px;
width: 370px;
height: 456px;
margin-left: 12px;
padding-left: 12px;
@ -835,19 +865,25 @@ a:focus { outline: none; }
height: 64px;
}
#co_author_relation_table .edit_co_author_relation {
margin-left: -10px;
/*margin-left: -10px;*/
}
#co_author_relation_table .list_item_function a {
display: inline-block;
padding: 4px;
font-family: Arial, sans-serif;
font-size: 11px;
-webkit-text-size-adjust: none;
}
#co_author_relation_table .form_space {
margin-bottom: 10px;
font-size: 15px;
font-size: 18px;
font-family: Arial, sans-serif;
}
/* Journal New Co-Author */
#new_co_author label {
margin-right: 0;
}
/* App */
.app_frame {

24
app/views/desktop/co_authors/_form.html.erb
View File

@ -1,22 +1,21 @@
<div class="toolbar hh2">
<div class="fn_g hp">
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn ini_input hp hh2 thmtxt" %>
</div>
<div></div>
</div>
<div id="new_co_author" class="s_grid_con s_form vp">
<ul>
<li class="s_grid_row">
<%= f.label :co_author %><br />
<%= f.text_field :co_author %>
<%= f.label :co_author, class: "s_grid s_grid_2" %>
<%= f.text_field :co_author, class: "s_grid s_grid_4" %>
</li>
<li class="s_grid_row">
<%= f.label :email %><br />
<%= f.text_field :email %>
<%= f.label :email, class: "s_grid s_grid_2"%>
<%= f.text_field :email, class: "s_grid s_grid_4" %>
</li>
<%= f.label :type%><br />
<li class="s_grid_row">
<%= f.label :type, class: "s_grid s_grid_2"%>
<select name="co_author[co_author_relations_id]" id="" class="s_grid s_grid_4">
<%= options_for_select(
@co_author_relations.map do |relation|
@ -26,3 +25,4 @@
</select>
</li>
</ul>
</div>

2
app/views/desktop/co_authors/edit.html.erb
View File

@ -1,3 +1,3 @@
<%= form_for @co_author_relation, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_author_path(@co_author_relation) do |f| %>
<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_author_path(@co_author) do |f| %>
<%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
<% end %>

2
app/views/desktop/co_authors/new.html.erb
View File

@ -1,3 +1,3 @@
<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_authors_path do |f| %>
<%= render partial: 'desktop/co_author_relations/form', locals: {:f => f} %>
<%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
<% end %>

7
app/views/desktop/journal_pages/_form.html.erb
View File

@ -92,10 +92,6 @@
<li class="s_grid_row">
<%= label_tag("", "Pages", class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%>
</li>
<li class="s_grid_row">
<%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
</li>
</ul>
</div>
<div class="s_grid_con s_form">
@ -160,6 +156,9 @@
<option value="">Writing</option>
</select>
</li>
<li class="s_grid_row">
<%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
</li>
</ul>
</div>
<div class="s_grid_con s_form">

2
app/views/desktop/journal_pages/_form_file.html.erb
View File

@ -2,7 +2,6 @@
<td>
<div>
<%= f.file_field :file, class: "s_grid_2 s_grid" %>
<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn s_grid_1 s_grid', :target => '_blank', :title => t(:view)} ) : '' %>
</div>
</td>
<td>
@ -18,6 +17,7 @@
<a class="remove_existing_record"><i class="icon-remove"></i></a>
<%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
<% end %>
<%= form_file.file.file ? ( link_to '', form_file.file.url, {:class => 'icon-eye-open', :target => '_blank', :title => t(:view)} ) : '' %>
</span>
</td>
</tr>