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

Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 

* 'publication' of https://github.com/Rulingcom/orbit:
  view update
  view update
This commit is contained in:
Rueshyna 2012-12-05 17:47:16 +08:00
parent b5e7f81108 b1fd82197e
commit 3e9cf27fe2
3 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,9 @@ a:focus { outline: none; }
font-size: 15px;
vertical-align: top;
}
.toolbar .fn_btn {
display: inline-block;
}
/* Setting Page */
.theme_list {}
@ -752,6 +754,24 @@ a:focus { outline: none; }
padding-left: 0;
border: none;
}
#journal_list .g_col .list_t_item {
padding-left: 30px;
height: 86px;
}
#journal_list .list_item_action {
font-size: 12px;
float: left;
margin-left: -30px;
}
#journal_list .list_item_action i {
color: #999;
font-size: 20px;
display: block;
width: 20px;
height: 20px;
line-height: 20px;
margin: 1px 1px 6px 1px;
}
/* App */
.app_frame {

52
app/views/desktop/co_authors/index.html.erb
View File

@ -1,28 +1,26 @@
<h1>list all coauthor</h1>
<%= link_to "New Co-Author", new_desktop_co_author_path, :class=>"bt-co-author" %>
<%= link_to "New Type", desktop_co_author_relations_path, :class=>"bt-new-type" %>
<table>
<thead>
<tr>
<th>Name</th>
<th>EMail</th>
<th>Type</th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<% @co_authors.each do |co_author| %>
<tr>
<td><%= co_author.co_author %></td>
<td><%= co_author.email %></td>
<td><%= @co_author_relations.find(co_author.co_author_relations_id).relation \
unless co_author.co_author_relations_id.nil?%></td>
<td><%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit" %></td>
<td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete" %></td>
</tr>
<div class="toolbar hh2">
<div class="fn_g hp">
<%= link_to "New Co-Author", new_desktop_co_author_path, :class=>"bt-co-author fn_btn hp hh2 thmc2 thmtxt" %>
<%= link_to "New Type", desktop_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh2 thmc2 thmtxt" %>
</div>
</div>
<% @co_authors.each_with_index do |co_author,i| %>
<% if ( i % 5 ) == 0 %>
<div class="g_col">
<ul>
<% end %>
<li class="list_t_item">
<div class="list_item_action">
<%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit" %>
<%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete" %>
</div>
<%= co_author.co_author %>
<%= co_author.email %>
<%= @co_author_relations.find(co_author.co_author_relations_id).relation \
unless co_author.co_author_relations_id.nil?%>
</li>
<% if ( i % 5 ) == 4 %>
</ul>
</div>
<% end %>
<% end %>
</tbody>
</table>
<br />

12
app/views/desktop/journal_lists/index.html.erb
View File

@ -18,15 +18,19 @@
<div class="viewport">
<div class="overview">
<% @journal_lists.each_with_index do |journal_list,i| %>
<% if ( i % 8 ) == 0 %>
<% if ( i % 5 ) == 0 %>
<div class="g_col">
<ul>
<% end %>
<li class="s_grid_row">
<li class="list_t_item">
<div class="list_item_action">
<i class="icon-file"></i>
</div>
<% title, level = journal_list %>
<%= title %> -- <%= level.join(",") %>
<div class="list_t_title"><%= title %></div>
<div class="list_t_desc"><%= level.join(",") %></div>
</li>
<% if ( i % 8 ) == 7 %>
<% if ( i % 5 ) == 4 %>
</ul>
</div>
<% end %>