From 743e177fbe5bffd83b7ac7a97ca0b039afd82ef4 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 16:10:15 +0800 Subject: [PATCH 1/2] view update --- .../javascripts/desktop/journal_pages.js.erb | 3 +- app/assets/stylesheets/desktopmain.css | 42 ++++++++-- .../desktop/journal_lists/index.html.erb | 29 ++++--- .../desktop/journal_pages/_form.html.erb | 79 +++++++------------ .../desktop/journal_pages/_form_file.html.erb | 4 +- app/views/devise/registrations/edit.html.erb | 24 +++--- 6 files changed, 101 insertions(+), 80 deletions(-) diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb index 4af5715c..f0d74f1f 100644 --- a/app/assets/javascripts/desktop/journal_pages.js.erb +++ b/app/assets/javascripts/desktop/journal_pages.js.erb @@ -238,10 +238,9 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.journal = function(){ // to open add pages in journal papers page var bindHandlers = function(){ // to bind handlers for add page o.simple_drop_down(); - o.tinyscrollbar_ext({ main: '.tinycanvas', - fill: '.s_grid_con' + fill: '.g_col' }) } bindHandlers(); diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 8f591e1f..112ae64b 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -26,7 +26,7 @@ time, mark, audio, video { #container input, #container textarea, #container select, #container input:focus, #container textarea:focus { border-radius: 0; box-shadow: none; - font: inherit; + font-family: inherit; } /* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, @@ -129,7 +129,10 @@ a:focus { outline: none; } border: none; } .ini_input:focus { outline: none; } -#search_app { position: relative; background-color: #fff; } +#search_app { + position: relative; + background-color: #fff; +} #search_app .form { position: absolute; left: 0; @@ -139,6 +142,7 @@ a:focus { outline: none; } height: 28px; line-height: 28px; background: none; + border: 0; } #search_app .submit { position: absolute; @@ -344,6 +348,7 @@ a:focus { outline: none; } font-size: 15px; line-height: 36px; text-align: center; + border: 0; } /* theme color opacity */ @@ -452,7 +457,7 @@ a:focus { outline: none; } height: 100%; left: 0; top: 0; - z-index: 9; + z-index: 10; } #orbitdiag .tile { background-color: #000; } .diag_holder { background-color: #000; } @@ -535,7 +540,7 @@ a:focus { outline: none; } .s_form input[type=text], .s_form input[type=password], .s_form textarea{ outline: solid 3px #f6f6f6; border: solid 1px #eee; - font-size: 18px; + font-size: 15px; font-family: Arial !important; margin: 0; padding: 6px; @@ -578,14 +583,14 @@ a:focus { outline: none; } height: 30px; line-height: 30px; right: 5px; - top: 4px; + top: 5px; display: block; background-color: #fff; } .s_form.s_grid_con { width: 416px; } .s_form .s_grid_row { width: 410px; } .s_form .s_grid_row .s_grid:first-child { margin-left: 0; } -.s_form input[type=text].s_grid, .s_form input[type=passowrd].s_grid, .s_form textarea.s_grid, .s_form label.s_grid { float: none; display: inline-block; margin-left: 10px; } +.s_form input[type=text].s_grid, .s_form input[type=passowrd].s_grid, .s_form textarea.s_grid, .s_form label.s_grid, .s_form select.s_grid { /*float: none; display: inline-block;*/ margin-left: 10px; } .s_form input[type=text].s_grid_1, .s_form input[type=passowrd].s_grid_1, .s_form textarea.s_grid_1 { width: 46px; } .s_form input[type=text].s_grid_2, .s_form input[type=passowrd].s_grid_2, .s_form textarea.s_grid_2 { width: 116px; } .s_form input[type=text].s_grid_3, .s_form input[type=passowrd].s_grid_3, .s_form textarea.s_grid_3 { width: 186px; } @@ -598,7 +603,30 @@ a:focus { outline: none; } .s_form select.s_grid_4 { width: 270px; } .s_form select.s_grid_5 { width: 340px; } .s_form select.s_grid_6 { width: 410px; } - +.s_form label.s_grid { line-height: 34px; } +.s_form select.s_grid { + height: 26px; + margin-top: 4px; + margin-bottom: 4px; +} +.s_form textarea.full_height { + height: 436px; +} +.s_form .s_table { + width: 100%; +} +.s_form .s_table th, .s_form .s_table td { + padding: 6px 0; +} +.s_form .s_table th { + text-align: left; +} +.s_form .s_table td { + vertical-align: middle; +} +.s_form .s_table thead th { + border-bottom: solid 1px #eee; +} #group_wrapper {} diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index 776f8dcc..d9b7de3d 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -1,15 +1,22 @@

journal_title -- journal_level

- -
-
-
-
- - <% @journal_lists.each_with_index do |journal_list,i| %> - <% if ( i % 5 ) == 0 %> -
-
    +
    +
    +
    +
    + <% @journal_lists.each_with_index do |journal_list,i| %> + <% if ( i % 8 ) == 0 %> +
    +
      + <% end %> +
    • + <%= journal_list %> +
      • + <% if ( i % 8 ) == 7 %> +
    +
    + <% end %> <% end %> +<<<<<<< HEAD
  • <% title, level = journal_list %> @@ -22,6 +29,8 @@ <% end %> <% end %> +======= +>>>>>>> view update
    • diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb index 3a513034..94810500 100644 --- a/app/views/desktop/journal_pages/_form.html.erb +++ b/app/views/desktop/journal_pages/_form.html.erb @@ -1,9 +1,9 @@
    - <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %> + <%= f.submit "Save", name: "commit", value: "Save", class: "ini_input hp hh2 thmc2 thmtxt" %> <% if not @writing_journal.new_record? %> - <%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> + <%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %> <% end %>
    @@ -11,23 +11,19 @@
    -
    + +
  • English
    • +
  • Chinese
-
+
-->
Share
@@ -74,15 +70,6 @@
@@ -138,28 +125,21 @@ %> - -
    -
  • - <%= label_tag("", "Date of Publication", class: "s_grid_4 s_grid") %> -
    • -
  • - <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %> -
    • -
- - +
  • + <%= label_tag("", "Date of Publication", class: "s_grid_3 s_grid") %> + <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> +
  • <%= f.text_field :keywords, size: "20", value: @writing_journal.keywords ||= "Keywords", class: "s_grid_6 s_grid"%>
  • -
    <%= f.label :year ,:class => "s_grid_2 s_grid" %>
    -
    <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %>
    + <%= f.label :year ,:class => "s_grid_2 s_grid" %> + <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %>
  • -
    <%= f.label :language ,:class => "s_grid_2 s_grid" %>
    + <%= f.label :language ,:class => "s_grid_2 s_grid" %> - - - - - +
    • -
    • - +
      - - - + + + - @@ -216,15 +195,16 @@
      +
      • - <%= f.text_area :note, size: "20x2", placeholder: "Note", class: "s_grid_6 s_grid"%> + <%= f.text_area :note, size: "20x22", placeholder: "Note", class: "s_grid_6 s_grid full_height"%>
      • - <%= f.text_area :abstract, size: "20x26", placeholder: "Abstract", class: "s_grid_6 s_grid"%> + <%= f.text_area :abstract, size: "20x22", placeholder: "Abstract", class: "s_grid_6 s_grid full_height"%>
      @@ -248,6 +228,7 @@ newfield.find('.action a.delete').click(function(){ newfield.remove(); }); + return false; }); $('.action a.remove_existing_record').click(function(){ diff --git a/app/views/desktop/journal_pages/_form_file.html.erb b/app/views/desktop/journal_pages/_form_file.html.erb index afba08b7..6eacd462 100644 --- a/app/views/desktop/journal_pages/_form_file.html.erb +++ b/app/views/desktop/journal_pages/_form_file.html.erb @@ -1,12 +1,12 @@ " class="list_item">
      FileFile NameFileFile NameAction
      -
      +
      		+
      <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> - add + add
      - <%= f.file_field :file, class: "s_grid_1 s_grid" %> + <%= 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)} ) : '' %>
      		- <%= f.text_field :title, :class=>'s_grid_1 s_grid' %> + <%= f.text_field :title, :class=>'s_grid_3 s_grid' %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 9ec8721d..2cedcb00 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,14 +1,18 @@ +
      +
      Password Managment
      + <%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %> +
        +
      • <%= f.label :current_password %> + <%= f.password_field :current_password %>
        • -<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %> -
        <%= f.submit "Update" %>
        +
      • <%= f.label :password %> + <%= f.password_field :password %>
        • -
        <%= f.label :current_password %> - <%= f.password_field :current_password %>
        +
      • <%= f.label :password_confirmation %> + <%= f.password_field :password_confirmation %>
        • +
      +
      <%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh2 hp" %>
      -
      <%= f.label :password %> - <%= f.password_field :password %>
      + <% end %> +
      -
      <%= f.label :password_confirmation %>
      - <%= f.password_field :password_confirmation %>
      - -<% end %> From e39e6536f57aa2d51e7a3024ae245e3d2f82c8ac Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 16:12:24 +0800 Subject: [PATCH 2/2] journal list --- .../desktop/journal_lists/index.html.erb | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index d9b7de3d..804787df 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -8,29 +8,15 @@
        <% end %> -
      • - <%= journal_list %> +
      • + <% title, level = journal_list %> + <%= title %> -- <%= level.join(",") %>
        • <% if ( i % 8 ) == 7 %>
      <% end %> <% end %> -<<<<<<< HEAD - -
    • - <% title, level = journal_list %> - <%= title %> -- <%= level.join(",") %> -
      • - - <% if ( i % 5 ) == 4 %> - - - <% end %> - <% end %> - -======= ->>>>>>> view update