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

* 'publication' of https://github.com/Rulingcom/orbit:
  view update
  view update

app/assets/stylesheets/desktopmain.css

@@ -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 {

app/views/desktop/co_authors/index.html.erb

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

app/views/desktop/journal_lists/index.html.erb

@@ -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 %>