From 62f1dadcb3e32b7746697aa60af3be7980128aca Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 17:17:04 +0800 Subject: [PATCH 1/2] view update --- app/assets/stylesheets/desktopmain.css | 18 ++++++++++++++++++ app/views/desktop/journal_lists/index.html.erb | 12 ++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 744c8d5b..bd239470 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -752,6 +752,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 { diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index bcfa77b3..44c8ab9f 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -18,15 +18,19 @@
<% @journal_lists.each_with_index do |journal_list,i| %> - <% if ( i % 8 ) == 0 %> + <% if ( i % 5 ) == 0 %>
    <% end %> -
  • +
  • +
    + +
    <% title, level = journal_list %> - <%= title %> -- <%= level.join(",") %> +
    <%= title %>
    +
    <%= level.join(",") %>
  • - <% if ( i % 8 ) == 7 %> + <% if ( i % 5 ) == 4 %>
<% end %> From b1fd82197e911ca88356d41b5f8c4dc36e9bdf51 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 17:45:50 +0800 Subject: [PATCH 2/2] view update --- app/assets/stylesheets/desktopmain.css | 4 +- app/views/desktop/co_authors/index.html.erb | 54 ++++++++++----------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index bd239470..a7ec7a6d 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/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 {} diff --git a/app/views/desktop/co_authors/index.html.erb b/app/views/desktop/co_authors/index.html.erb index b01b2569..7aacbd70 100644 --- a/app/views/desktop/co_authors/index.html.erb +++ b/app/views/desktop/co_authors/index.html.erb @@ -1,28 +1,26 @@ -

list all coauthor

-<%= 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" %> - - - - - - - - - - - - -<% @co_authors.each do |co_author| %> - - - - - - - -<% end %> - -
NameEMailType
<%= 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?%><%= 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" %>
-
+
+
+ <%= 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" %> +
+
+<% @co_authors.each_with_index do |co_author,i| %> + <% if ( i % 5 ) == 0 %> +
+
    + <% end %> +
  • +
    + <%= 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" %> +
    + <%= 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?%> +
  • + <% if ( i % 5 ) == 4 %> +
+
+ <% end %> +<% end %> \ No newline at end of file