From 000cb4dcd6e90c987bdb0faf37402b2364a58f13 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 16:40:23 +0800 Subject: [PATCH] journal update --- app/assets/stylesheets/desktopmain.css | 17 ++++++++++++++++ app/assets/stylesheets/orbit-bar.css.erb | 1 + .../desktop/journal_lists/index.html.erb | 20 ++++++++++++++++--- .../desktop/journal_pages/_form.html.erb | 9 ++++----- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 112ae64b..744c8d5b 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -736,6 +736,23 @@ a:focus { outline: none; } #paper_add .f_w { width: 336px; } #paper_add label { margin-right: 0; } +/* Journal Journal list */ +#journal_list .g_col { + width: 416px; +} +#journal_list .g_col { + float: left; + height: 456px; + margin-left: 12px; + padding-left: 12px; + border-left: solid 1px #EEE; +} +#journal_list .g_col:first-child { + margin-left: 0; + padding-left: 0; + border: none; +} + /* App */ .app_frame { margin: 48px 96px 48px 156px; diff --git a/app/assets/stylesheets/orbit-bar.css.erb b/app/assets/stylesheets/orbit-bar.css.erb index 38441260..154f1158 100644 --- a/app/assets/stylesheets/orbit-bar.css.erb +++ b/app/assets/stylesheets/orbit-bar.css.erb @@ -143,6 +143,7 @@ display: inline-block; line-height: 22px; padding: 0 10px; + vertical-align: top; } #orbit-bar .nav img.member-img { display: inline-block; diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index 804787df..bcfa77b3 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -1,11 +1,25 @@ -

journal_title -- journal_level

-
+
+
+
Share
+
+ +
+
+
+
+
+
+
<% @journal_lists.each_with_index do |journal_list,i| %> <% if ( i % 8 ) == 0 %> -
+
    <% end %>
  • diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb index 94810500..c67745c4 100644 --- a/app/views/desktop/journal_pages/_form.html.erb +++ b/app/views/desktop/journal_pages/_form.html.erb @@ -1,21 +1,20 @@
    - <%= f.submit "Save", name: "commit", value: "Save", class: "ini_input hp hh2 thmc2 thmtxt" %> + <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> <% if not @writing_journal.new_record? %> <%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %> <% end %>
    -
    +
    -