From a790c0c4824cafc84883d608868424436b9abc1a Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 4 Dec 2012 10:29:30 +0800 Subject: [PATCH 01/64] add content for announcement rss --- .../announcement/front_end/bulletins/index.rss.builder | 1 + .../panel/announcement/front_end/bulletins/show.rss.builder | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder index 40698bfc5..2a5d7f85c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder @@ -12,6 +12,7 @@ xml.rss :version => "2.0" do xml.item do xml.title bulletin.title_translations[I18n.locale.to_s] xml.pubDate bulletin.postdate.to_s(:rfc822) + xml.description bulletin.text_translations[I18n.locale.to_s] xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:only_path=>false) xml.guid url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:only_path=>false) xml.fb_share generate_fb_url(bulletin, "announcement") diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder index c4ddacfad..34fb7a983 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder @@ -8,12 +8,12 @@ xml.rss :version => "2.0" do end xml.link url_for(:action=>"index", :controller=>"panel/announcement/front_end/bulletins",:format=> :rss,:only_path=>false,:inner=>true) xml.item do - xml.title @bulletin.title - xml.description @bulletin.text + xml.title @bulletin.title_translations[I18n.locale.to_s] + xml.description @bulletin.text_translations[I18n.locale.to_s] xml.pubDate @bulletin.postdate.to_s(:rfc822) xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>@bulletin ,:format=> :rss,:only_path=>false,:inner=>true) xml.guid url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>@bulletin ,:only_path=>false) end # end end -end \ No newline at end of file +end From 501931df064de68417ff83fd0458c88ff099e197 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 4 Dec 2012 17:45:40 +0800 Subject: [PATCH 02/64] delete onside widget in db --- app/models/desktop/section.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/desktop/section.rb b/app/models/desktop/section.rb index f9035c698..1a4c0c4dd 100644 --- a/app/models/desktop/section.rb +++ b/app/models/desktop/section.rb @@ -11,7 +11,6 @@ class Section def initialize_group self.groups.build - self.groups.build end -end \ No newline at end of file +end From b150077b7b9c822d8436cd16c24326d48540b206 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 4 Dec 2012 18:55:49 +0800 Subject: [PATCH 03/64] change settings table default display --- app/views/desktop/settings.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 590f4e89d..eecd9f4aa 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -9,8 +9,8 @@
    -
  • Overview
  • -
  • Account
  • +
  • Overview
  • +
  • Account
  • Sections
  • Theme
  • Connection
  • From 37850c6d9008a4e2973d75e1a99b02b8bda8dc91 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 11:46:25 +0800 Subject: [PATCH 04/64] midify button type --- app/views/desktop/co_author_relations/index.html.erb | 2 +- app/views/desktop/co_authors/_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/desktop/co_author_relations/index.html.erb b/app/views/desktop/co_author_relations/index.html.erb index 106418acb..0b91d143d 100644 --- a/app/views/desktop/co_author_relations/index.html.erb +++ b/app/views/desktop/co_author_relations/index.html.erb @@ -1,6 +1,6 @@

    Listing co_author_relations

    -<%= submit_tag "Back", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> +<%= submit_tag "Back", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> <%= render 'form' %> diff --git a/app/views/desktop/co_authors/_form.html.erb b/app/views/desktop/co_authors/_form.html.erb index b087be956..2d8aa2d9d 100644 --- a/app/views/desktop/co_authors/_form.html.erb +++ b/app/views/desktop/co_authors/_form.html.erb @@ -1,6 +1,6 @@
    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %> - <%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> + <%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
    From 4ebbd7cb5a5a3f1b5564c476ebc7622577e7304f Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 13:49:53 +0800 Subject: [PATCH 05/64] when delete co-author relation, the co-author will be reset nil --- app/controllers/desktop/co_author_relations_controller.rb | 1 + app/helpers/desktop/co_author_relations_helper.rb | 6 ++++++ db/seeds.rb | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/desktop/co_author_relations_controller.rb b/app/controllers/desktop/co_author_relations_controller.rb index f35391dd3..edeeacb82 100644 --- a/app/controllers/desktop/co_author_relations_controller.rb +++ b/app/controllers/desktop/co_author_relations_controller.rb @@ -27,6 +27,7 @@ class Desktop::CoAuthorRelationsController < ApplicationController def destroy @co_author_relation = CoAuthorRelation.find(params[:id]) @co_author_relation.destroy + #reset_co_author_relation @co_author_relation render :json => {success: true, msg: "deleted successfully!"} end diff --git a/app/helpers/desktop/co_author_relations_helper.rb b/app/helpers/desktop/co_author_relations_helper.rb index fa03bbae6..7de132116 100644 --- a/app/helpers/desktop/co_author_relations_helper.rb +++ b/app/helpers/desktop/co_author_relations_helper.rb @@ -1,2 +1,8 @@ module Desktop::CoAuthorRelationsHelper + def reset_co_author_relation relation + co_author = CoAuthor.where(co_author_relations_id: relation) + co_author.map do |c| + co_author.update_attributes(co_author_relations_id: nil) + end + end end diff --git a/db/seeds.rb b/db/seeds.rb index 9c90554cd..c9dd1c3d2 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -33,7 +33,7 @@ FactoryGirl.define do { zh_tw: "#{name_tw[n]}", en: "#{name_en[n]}" } end - f.sequence(:type) do |n| "#{type[n%5]}" end + f.sequence(:co_author_relations_id) do |n| "#{CoAuthorRelation.all[n%type.size].id}" end f.sequence(:email) do |n| "#{email[n]}" end f.name_id BSON::ObjectId('4f45f3b9e9d02c5db9000067') #user_id, this is Chris' account end From 00c8bca957933218b7a5a74ff2aea5e79699e15e Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 14:51:12 +0800 Subject: [PATCH 06/64] fixed co-author relation bug.... --- .../desktop/co_author_relations_controller.rb | 11 ++++++++++- app/helpers/desktop/co_author_relations_helper.rb | 6 ------ .../desktop/co_author_relations/_show_form.html.erb | 6 ++---- app/views/desktop/co_author_relations/index.html.erb | 4 +++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/controllers/desktop/co_author_relations_controller.rb b/app/controllers/desktop/co_author_relations_controller.rb index edeeacb82..787ad36cc 100644 --- a/app/controllers/desktop/co_author_relations_controller.rb +++ b/app/controllers/desktop/co_author_relations_controller.rb @@ -27,8 +27,17 @@ class Desktop::CoAuthorRelationsController < ApplicationController def destroy @co_author_relation = CoAuthorRelation.find(params[:id]) @co_author_relation.destroy - #reset_co_author_relation @co_author_relation + reset_co_author_relation render :json => {success: true, msg: "deleted successfully!"} end + + private + + def reset_co_author_relation + co_author = CoAuthor.where(co_author_relations_id: @co_author_relation.id) + co_author.map do |c| + c.update_attributes(co_author_relations_id: nil) + end + end end diff --git a/app/helpers/desktop/co_author_relations_helper.rb b/app/helpers/desktop/co_author_relations_helper.rb index 7de132116..fa03bbae6 100644 --- a/app/helpers/desktop/co_author_relations_helper.rb +++ b/app/helpers/desktop/co_author_relations_helper.rb @@ -1,8 +1,2 @@ module Desktop::CoAuthorRelationsHelper - def reset_co_author_relation relation - co_author = CoAuthor.where(co_author_relations_id: relation) - co_author.map do |c| - co_author.update_attributes(co_author_relations_id: nil) - end - end end diff --git a/app/views/desktop/co_author_relations/_show_form.html.erb b/app/views/desktop/co_author_relations/_show_form.html.erb index 28ded9927..bdb9f72e6 100644 --- a/app/views/desktop/co_author_relations/_show_form.html.erb +++ b/app/views/desktop/co_author_relations/_show_form.html.erb @@ -1,6 +1,4 @@ -<%# @co_author_relations.each do |co_author_relation| %> - - + + -<%# end %> diff --git a/app/views/desktop/co_author_relations/index.html.erb b/app/views/desktop/co_author_relations/index.html.erb index 0b91d143d..24791349c 100644 --- a/app/views/desktop/co_author_relations/index.html.erb +++ b/app/views/desktop/co_author_relations/index.html.erb @@ -12,6 +12,8 @@ - <%= render :partial => 'show_form', :collection => @co_author_relations %> + <% @co_author_relations.each do |co_author_relation| %> + <%= render :partial => 'show_form', locals: {:co_author_relation => co_author_relation} %> + <% end %>
    <%= show_form.relation %><%= link_to 'Destroy', desktop_co_author_relation_path(show_form), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %><%= co_author_relation.relation %><%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %>
    From 3e752b94eccd081881f6f9c4640f4ee1b31922e3 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 15:09:58 +0800 Subject: [PATCH 07/64] fixed new co-author relation bug.... --- app/controllers/desktop/co_author_relations_controller.rb | 5 +++-- app/views/desktop/co_author_relations/_show_form.html.erb | 2 ++ app/views/desktop/co_author_relations/index.html.erb | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/desktop/co_author_relations_controller.rb b/app/controllers/desktop/co_author_relations_controller.rb index 787ad36cc..cb01915e4 100644 --- a/app/controllers/desktop/co_author_relations_controller.rb +++ b/app/controllers/desktop/co_author_relations_controller.rb @@ -14,10 +14,11 @@ class Desktop::CoAuthorRelationsController < ApplicationController def create @new_relation = CoAuthorRelation.new(params[:co_author_relation]) + @co_author_relations = CoAuthorRelation.all if @new_relation.save - newv = render_to_string :partial=>"show_form", :object=>@new_relation - render json: {success:true, msg: "New Relation successfully saved!","newvalue"=>newv}.to_json + newv = render_to_string partial: "show_form", object: @co_author_relations + render json: {success: true, msg: "New Relation successfully saved!", newvalue: newv}.to_json else error_msg = @new_relation.errors.full_messages.join("
    ") render json: {success: false, msg: error_msg}.to_json diff --git a/app/views/desktop/co_author_relations/_show_form.html.erb b/app/views/desktop/co_author_relations/_show_form.html.erb index bdb9f72e6..d3c803d33 100644 --- a/app/views/desktop/co_author_relations/_show_form.html.erb +++ b/app/views/desktop/co_author_relations/_show_form.html.erb @@ -1,4 +1,6 @@ + <% @co_author_relations.each do |co_author_relation| %> <%= co_author_relation.relation %> <%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %> + <% end %> diff --git a/app/views/desktop/co_author_relations/index.html.erb b/app/views/desktop/co_author_relations/index.html.erb index 24791349c..157db9428 100644 --- a/app/views/desktop/co_author_relations/index.html.erb +++ b/app/views/desktop/co_author_relations/index.html.erb @@ -12,8 +12,6 @@ - <% @co_author_relations.each do |co_author_relation| %> - <%= render :partial => 'show_form', locals: {:co_author_relation => co_author_relation} %> - <% end %> + <%= render :partial => 'show_form'%> From 27ae41c833d9ad65e2dda8e691e9a1fbd3e46769 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 15:33:47 +0800 Subject: [PATCH 08/64] make journal list easy to read --- app/controllers/desktop/journal_lists_controller.rb | 3 +-- app/views/desktop/app_manager.html.erb | 0 app/views/desktop/desktop.html.erb | 0 app/views/desktop/index.html.erb | 0 app/views/desktop/journal_lists/index.html.erb | 5 ++++- 5 files changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 app/views/desktop/app_manager.html.erb mode change 100755 => 100644 app/views/desktop/desktop.html.erb mode change 100755 => 100644 app/views/desktop/index.html.erb diff --git a/app/controllers/desktop/journal_lists_controller.rb b/app/controllers/desktop/journal_lists_controller.rb index 8605b47d5..4ced50553 100644 --- a/app/controllers/desktop/journal_lists_controller.rb +++ b/app/controllers/desktop/journal_lists_controller.rb @@ -7,8 +7,7 @@ class Desktop::JournalListsController < ApplicationController [ j.journal_title, j.journal_level_type_ids.map do |type| level_types.find(type).title - end.join(",") - ].join(" -- ") + end] end @journal_lists = all_journal_lists.uniq diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb old mode 100755 new mode 100644 diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb old mode 100755 new mode 100644 diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb old mode 100755 new mode 100644 diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index fad6ca669..776f8dccc 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -10,9 +10,12 @@
      <% end %> +
    • - <%= journal_list %> + <% title, level = journal_list %> + <%= title %> -- <%= level.join(",") %>
    • + <% if ( i % 5 ) == 4 %>
    From 9041f9cd7b10f91dafa10d96d9e0652bf5d8f522 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 15:34:21 +0800 Subject: [PATCH 09/64] make journal list easy to read --- app/views/desktop/journal_lists/_form.html.erb | 17 ----------------- app/views/desktop/journal_lists/edit.html.erb | 6 ------ app/views/desktop/journal_lists/new.html.erb | 5 ----- app/views/desktop/journal_lists/show.html.erb | 5 ----- 4 files changed, 33 deletions(-) delete mode 100644 app/views/desktop/journal_lists/_form.html.erb delete mode 100644 app/views/desktop/journal_lists/edit.html.erb delete mode 100644 app/views/desktop/journal_lists/new.html.erb delete mode 100644 app/views/desktop/journal_lists/show.html.erb diff --git a/app/views/desktop/journal_lists/_form.html.erb b/app/views/desktop/journal_lists/_form.html.erb deleted file mode 100644 index ac7f7ac68..000000000 --- a/app/views/desktop/journal_lists/_form.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -<%= form_for(@desktop_journal_list) do |f| %> - <% if @desktop_journal_list.errors.any? %> -
    -

    <%= pluralize(@desktop_journal_list.errors.count, "error") %> prohibited this desktop_journal_list from being saved:

    - -
      - <% @desktop_journal_list.errors.full_messages.each do |msg| %> -
    • <%= msg %>
    • - <% end %> -
    -
    - <% end %> - -
    - <%= f.submit %> -
    -<% end %> diff --git a/app/views/desktop/journal_lists/edit.html.erb b/app/views/desktop/journal_lists/edit.html.erb deleted file mode 100644 index d628e8953..000000000 --- a/app/views/desktop/journal_lists/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

    Editing desktop_journal_list

    - -<%= render 'form' %> - -<%= link_to 'Show', @desktop_journal_list %> | -<%= link_to 'Back', desktop_journal_lists_path %> diff --git a/app/views/desktop/journal_lists/new.html.erb b/app/views/desktop/journal_lists/new.html.erb deleted file mode 100644 index 95017361a..000000000 --- a/app/views/desktop/journal_lists/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

    New desktop_journal_list

    - -<%= render 'form' %> - -<%= link_to 'Back', desktop_journal_lists_path %> diff --git a/app/views/desktop/journal_lists/show.html.erb b/app/views/desktop/journal_lists/show.html.erb deleted file mode 100644 index d454b78f3..000000000 --- a/app/views/desktop/journal_lists/show.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

    <%= notice %>

    - - -<%= link_to 'Edit', edit_desktop_journal_list_path(@desktop_journal_list) %> | -<%= link_to 'Back', desktop_journal_lists_path %> From 1be794328a06bfb586332ba9607083a9c4cf79dd Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 16:00:36 +0800 Subject: [PATCH 10/64] clean route table about desktop --- app/controllers/desktop/co_authors_controller.rb | 9 --------- app/controllers/desktop/journal_lists_controller.rb | 1 - app/controllers/desktop/journal_pages_controller.rb | 11 ----------- config/routes.rb | 8 ++++---- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/app/controllers/desktop/co_authors_controller.rb b/app/controllers/desktop/co_authors_controller.rb index c027a162c..913900716 100644 --- a/app/controllers/desktop/co_authors_controller.rb +++ b/app/controllers/desktop/co_authors_controller.rb @@ -8,15 +8,6 @@ class Desktop::CoAuthorsController < ApplicationController end end - def show - @co_author = CoAuthor.find(params[:id]) - - respond_to do |format| - format.html { redirect_to desktop_co_authors_url, :layout => false } - format.json { render json: @co_author } - end - end - def new @co_author = CoAuthor.new @co_author_relations = CoAuthorRelation.all diff --git a/app/controllers/desktop/journal_lists_controller.rb b/app/controllers/desktop/journal_lists_controller.rb index 4ced50553..2667a5a77 100644 --- a/app/controllers/desktop/journal_lists_controller.rb +++ b/app/controllers/desktop/journal_lists_controller.rb @@ -1,5 +1,4 @@ class Desktop::JournalListsController < ApplicationController - def index level_types = JournalLevelType.all all_journal_lists = WritingJournal.where(create_user_id: current_user.id) diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb index 5775be0a4..8a2312b85 100644 --- a/app/controllers/desktop/journal_pages_controller.rb +++ b/app/controllers/desktop/journal_pages_controller.rb @@ -1,6 +1,4 @@ class Desktop::JournalPagesController < ApplicationController - #before_filter :check_for_cancel, :only => [:create, :update] - def index @writing_journal = WritingJournal.where(create_user_id: current_user.id) @level_types = JournalLevelType.all @@ -10,9 +8,6 @@ class Desktop::JournalPagesController < ApplicationController end end - def show - end - def new @writing_journal = WritingJournal.new @level_types = JournalLevelType.all @@ -109,10 +104,4 @@ class Desktop::JournalPagesController < ApplicationController render json: JSON.pretty_generate(data) end - private - - def check_for_cancel - if params[:commit] == "Cancel" - end - end end diff --git a/config/routes.rb b/config/routes.rb index 2a9d98fce..32d8430a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,10 +180,10 @@ Orbit::Application.routes.draw do match '/widget_layout' => 'desktop#widget_layout' match '/temp_func/'=>'desktop#temp_func' - resources :journal_pages - resources :journal_lists - resources :co_authors - resources :co_author_relations + resources :journal_pages, except: :show + resources :journal_lists, only: :index + resources :co_authors, except: :show + resources :co_author_relations, except: :show end # namespace :desktop_publications do From 743e177fbe5bffd83b7ac7a97ca0b039afd82ef4 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 16:10:15 +0800 Subject: [PATCH 11/64] 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 4af5715ce..f0d74f1fe 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 8f591e1fb..112ae64bd 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 776f8dccc..d9b7de3d8 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 3a513034c..94810500f 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 @@
      -
    -
    +
    -->
    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" %> - - - - - +
-
+
+ From 7d3c535e0195ffc2ab66fb5f3066ea3da8613787 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Dec 2012 20:32:28 +0800 Subject: [PATCH 33/64] add info field --- app/controllers/admin/infos_controller.rb | 15 +++++- app/models/user/attribute_field.rb | 1 + .../attributes/add_attribute_field.js.erb | 1 + app/views/admin/attributes/edit.html.erb | 15 +++--- .../attribute_field/_attribute_field.html.erb | 47 ++++++++++--------- 5 files changed, 50 insertions(+), 29 deletions(-) create mode 100644 app/views/admin/attributes/add_attribute_field.js.erb diff --git a/app/controllers/admin/infos_controller.rb b/app/controllers/admin/infos_controller.rb index c08d13862..e79fba7b3 100644 --- a/app/controllers/admin/infos_controller.rb +++ b/app/controllers/admin/infos_controller.rb @@ -8,6 +8,9 @@ class Admin::InfosController < ApplicationController def index @attributes = Info.all.entries + + @roles = Role.excludes('disabled' => true) + render :template => 'admin/attributes/index' end @@ -22,7 +25,7 @@ class Admin::InfosController < ApplicationController def edit @attribute = Info.find(params[:id]) - @attribute_fields_upper_object = [@attribute] + # @attribute_fields_upper_object = [@attribute] render :template => 'admin/attributes/edit' end @@ -49,10 +52,20 @@ class Admin::InfosController < ApplicationController end def add_attribute_field + attribute = Info.find(params[:info_id]) rescue nil @attribute_field_counter = attribute.attribute_fields.count @attribute_field = attribute.attribute_fields.build @attribute_field.save + + @attribute_field[:af_count] = @attribute_field_counter + + @attribute = Info.find(params[:info_id]) + + respond_to do |format| + format.js { render 'admin/attributes/add_attribute_field' } + end + end protected diff --git a/app/models/user/attribute_field.rb b/app/models/user/attribute_field.rb index c0aabb9c5..d486ccd04 100644 --- a/app/models/user/attribute_field.rb +++ b/app/models/user/attribute_field.rb @@ -4,6 +4,7 @@ class AttributeField include ::AttributeFieldsHelper field :key + field :af_count field :markup ,:default=>"text_field" field :option_list ,:type => Hash,:default => {} field :markup_options,:type => Hash diff --git a/app/views/admin/attributes/add_attribute_field.js.erb b/app/views/admin/attributes/add_attribute_field.js.erb new file mode 100644 index 000000000..dd3d7198c --- /dev/null +++ b/app/views/admin/attributes/add_attribute_field.js.erb @@ -0,0 +1 @@ +$('<%= j render :partial => 'shared/attribute_field/attribute_field', :collection => [@attribute_field] %>').appendTo('#attribute_field_list').hide().fadeIn(); diff --git a/app/views/admin/attributes/edit.html.erb b/app/views/admin/attributes/edit.html.erb index 6c980863d..301bf18b5 100644 --- a/app/views/admin/attributes/edit.html.erb +++ b/app/views/admin/attributes/edit.html.erb @@ -18,13 +18,14 @@ - - <% @attribute_fields_upper_object.each do |attribute|%> -
-

<%= attribute.title+ t(:attributes)%>

- <%= render :partial=>"shared/attribute_field/attribute_field",:collection=>attribute.attribute_fields%> -
- <% end %> + +
+

<%= @attribute.title+ t(:attributes)%>

+
+ <%= render :partial=>"shared/attribute_field/attribute_field",:collection=>@attribute.attribute_fields%> +
+
+
<%= link_to content_tag(:i,t(:add_attribute_field),:class=>"icon-plus icon-white"),admin_info_add_attribute_field_path(@attribute),:class=>"btn btn-primary",:remote => true%> diff --git a/app/views/shared/attribute_field/_attribute_field.html.erb b/app/views/shared/attribute_field/_attribute_field.html.erb index 5f28cd03f..30623fbec 100644 --- a/app/views/shared/attribute_field/_attribute_field.html.erb +++ b/app/views/shared/attribute_field/_attribute_field.html.erb @@ -1,24 +1,29 @@
+ <% + attribute_field.af_count ? @af_counter = attribute_field_counter + attribute_field.af_count : @af_counter = attribute_field_counter + %> + <%= @af_counter %> + <%#= attribute_field_counter %> - <%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","disabled",:value=>attribute_field.disabled,:class=>"attribute_field_disabled"%> - <%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%> + <%= hidden_field "info[attribute_fields][#{@af_counter}]","disabled",:value=>attribute_field.disabled,:class=>"attribute_field_disabled"%> + <%= hidden_field "info[attribute_fields][#{@af_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%> <%= t(:delete_)%>
- <%= text_field "info[attribute_fields][#{attribute_field_counter}]","key",:value=>attribute_field.key%> + <%= text_field "info[attribute_fields][#{@af_counter}]","key",:value=>attribute_field.key%>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%> + <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"info[attribute_fields][#{@af_counter}][title_translations]"}%>
- <%#= select_tag "info[attribute_fields][#{attribute_field_counter}][markup]" do %> - > <%LIST[:markups].each do |key,val|%> <% end %> @@ -33,25 +38,25 @@
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeA][placeholder]"}%> + <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"info[attribute_fields][#{@af_counter}][typeA][placeholder]"}%> <% end %> <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeB") do %> - <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%> + <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{@af_counter}][typeB][initial]"}%> <% if attribute_field.self_defined_markup_options?%> - <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][attribute][role][statuses]"} %> + <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{@af_counter}][attribute][role][statuses]"} %> <%else #normal list%> - <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][typeB][option_list]"} %> + <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{@af_counter}][typeB][option_list]"} %> <% end #of self_defined_markup_options?%> <% end %> @@ -59,17 +64,17 @@
- <%= select "info[attribute_fields][#{attribute_field_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %> + <%= select "info[attribute_fields][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
@@ -77,10 +82,10 @@
@@ -90,16 +95,16 @@
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeD][placeholder]",:values=>attribute_field["typeD"]["placeholder"]} %> + <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:field_name=>"info[attribute_fields][#{@af_counter}][typeD][placeholder]",:values=>attribute_field["typeD"]["placeholder"]} %> <% end %> <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeE") do%> - <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeE][option_list]",:values=>attribute_field["option_list"]}%> + <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:field_name=>"info[attribute_fields][#{@af_counter}][typeE][option_list]",:values=>attribute_field["option_list"]}%> <% end %>
- <%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","id",:value=>attribute_field.id%> + <%= hidden_field "info[attribute_fields][#{@af_counter}]","id",:value=>attribute_field.id%>
From 4a8878132ec1af389f849e7b2a57abf2456a3192 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 4 Dec 2012 10:29:30 +0800 Subject: [PATCH 34/64] add content for announcement rss --- .../announcement/front_end/bulletins/index.rss.builder | 1 + .../panel/announcement/front_end/bulletins/show.rss.builder | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder index 40698bfc5..2a5d7f85c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder @@ -12,6 +12,7 @@ xml.rss :version => "2.0" do xml.item do xml.title bulletin.title_translations[I18n.locale.to_s] xml.pubDate bulletin.postdate.to_s(:rfc822) + xml.description bulletin.text_translations[I18n.locale.to_s] xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:only_path=>false) xml.guid url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:only_path=>false) xml.fb_share generate_fb_url(bulletin, "announcement") diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder index c4ddacfad..34fb7a983 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder @@ -8,12 +8,12 @@ xml.rss :version => "2.0" do end xml.link url_for(:action=>"index", :controller=>"panel/announcement/front_end/bulletins",:format=> :rss,:only_path=>false,:inner=>true) xml.item do - xml.title @bulletin.title - xml.description @bulletin.text + xml.title @bulletin.title_translations[I18n.locale.to_s] + xml.description @bulletin.text_translations[I18n.locale.to_s] xml.pubDate @bulletin.postdate.to_s(:rfc822) xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>@bulletin ,:format=> :rss,:only_path=>false,:inner=>true) xml.guid url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>@bulletin ,:only_path=>false) end # end end -end \ No newline at end of file +end From e0e1c30f68fc84bd58d3117d0aceae1152e948e1 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 4 Dec 2012 17:45:40 +0800 Subject: [PATCH 35/64] delete onside widget in db --- app/models/desktop/section.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/desktop/section.rb b/app/models/desktop/section.rb index f9035c698..1a4c0c4dd 100644 --- a/app/models/desktop/section.rb +++ b/app/models/desktop/section.rb @@ -11,7 +11,6 @@ class Section def initialize_group self.groups.build - self.groups.build end -end \ No newline at end of file +end From 21b1432f7faddb182e8159827202fbf4959209e9 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Tue, 4 Dec 2012 18:55:49 +0800 Subject: [PATCH 36/64] change settings table default display --- app/views/desktop/settings.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 590f4e89d..eecd9f4aa 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -9,8 +9,8 @@
    -
  • Overview
  • -
  • Account
  • +
  • Overview
  • +
  • Account
  • Sections
  • Theme
  • Connection
  • From 09c59c4e0344662da409a69e1c8218c86dcb572d Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 11:46:25 +0800 Subject: [PATCH 37/64] midify button type --- app/views/desktop/co_author_relations/index.html.erb | 2 +- app/views/desktop/co_authors/_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/desktop/co_author_relations/index.html.erb b/app/views/desktop/co_author_relations/index.html.erb index 106418acb..0b91d143d 100644 --- a/app/views/desktop/co_author_relations/index.html.erb +++ b/app/views/desktop/co_author_relations/index.html.erb @@ -1,6 +1,6 @@

    Listing co_author_relations

    -<%= submit_tag "Back", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> +<%= submit_tag "Back", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> <%= render 'form' %> diff --git a/app/views/desktop/co_authors/_form.html.erb b/app/views/desktop/co_authors/_form.html.erb index b087be956..2d8aa2d9d 100644 --- a/app/views/desktop/co_authors/_form.html.erb +++ b/app/views/desktop/co_authors/_form.html.erb @@ -1,6 +1,6 @@
    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %> - <%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> + <%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
    From afd8e7e3805214685004da6a7b169ce8569139ba Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 13:49:53 +0800 Subject: [PATCH 38/64] when delete co-author relation, the co-author will be reset nil --- app/controllers/desktop/co_author_relations_controller.rb | 1 + app/helpers/desktop/co_author_relations_helper.rb | 6 ++++++ db/seeds.rb | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/desktop/co_author_relations_controller.rb b/app/controllers/desktop/co_author_relations_controller.rb index f35391dd3..edeeacb82 100644 --- a/app/controllers/desktop/co_author_relations_controller.rb +++ b/app/controllers/desktop/co_author_relations_controller.rb @@ -27,6 +27,7 @@ class Desktop::CoAuthorRelationsController < ApplicationController def destroy @co_author_relation = CoAuthorRelation.find(params[:id]) @co_author_relation.destroy + #reset_co_author_relation @co_author_relation render :json => {success: true, msg: "deleted successfully!"} end diff --git a/app/helpers/desktop/co_author_relations_helper.rb b/app/helpers/desktop/co_author_relations_helper.rb index fa03bbae6..7de132116 100644 --- a/app/helpers/desktop/co_author_relations_helper.rb +++ b/app/helpers/desktop/co_author_relations_helper.rb @@ -1,2 +1,8 @@ module Desktop::CoAuthorRelationsHelper + def reset_co_author_relation relation + co_author = CoAuthor.where(co_author_relations_id: relation) + co_author.map do |c| + co_author.update_attributes(co_author_relations_id: nil) + end + end end diff --git a/db/seeds.rb b/db/seeds.rb index 9c90554cd..c9dd1c3d2 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -33,7 +33,7 @@ FactoryGirl.define do { zh_tw: "#{name_tw[n]}", en: "#{name_en[n]}" } end - f.sequence(:type) do |n| "#{type[n%5]}" end + f.sequence(:co_author_relations_id) do |n| "#{CoAuthorRelation.all[n%type.size].id}" end f.sequence(:email) do |n| "#{email[n]}" end f.name_id BSON::ObjectId('4f45f3b9e9d02c5db9000067') #user_id, this is Chris' account end From 1289ad9f9de3d88d83f539b9b034b20b5103e3e9 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 14:51:12 +0800 Subject: [PATCH 39/64] fixed co-author relation bug.... --- .../desktop/co_author_relations_controller.rb | 11 ++++++++++- app/helpers/desktop/co_author_relations_helper.rb | 6 ------ .../desktop/co_author_relations/_show_form.html.erb | 6 ++---- app/views/desktop/co_author_relations/index.html.erb | 4 +++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/controllers/desktop/co_author_relations_controller.rb b/app/controllers/desktop/co_author_relations_controller.rb index edeeacb82..787ad36cc 100644 --- a/app/controllers/desktop/co_author_relations_controller.rb +++ b/app/controllers/desktop/co_author_relations_controller.rb @@ -27,8 +27,17 @@ class Desktop::CoAuthorRelationsController < ApplicationController def destroy @co_author_relation = CoAuthorRelation.find(params[:id]) @co_author_relation.destroy - #reset_co_author_relation @co_author_relation + reset_co_author_relation render :json => {success: true, msg: "deleted successfully!"} end + + private + + def reset_co_author_relation + co_author = CoAuthor.where(co_author_relations_id: @co_author_relation.id) + co_author.map do |c| + c.update_attributes(co_author_relations_id: nil) + end + end end diff --git a/app/helpers/desktop/co_author_relations_helper.rb b/app/helpers/desktop/co_author_relations_helper.rb index 7de132116..fa03bbae6 100644 --- a/app/helpers/desktop/co_author_relations_helper.rb +++ b/app/helpers/desktop/co_author_relations_helper.rb @@ -1,8 +1,2 @@ module Desktop::CoAuthorRelationsHelper - def reset_co_author_relation relation - co_author = CoAuthor.where(co_author_relations_id: relation) - co_author.map do |c| - co_author.update_attributes(co_author_relations_id: nil) - end - end end diff --git a/app/views/desktop/co_author_relations/_show_form.html.erb b/app/views/desktop/co_author_relations/_show_form.html.erb index 28ded9927..bdb9f72e6 100644 --- a/app/views/desktop/co_author_relations/_show_form.html.erb +++ b/app/views/desktop/co_author_relations/_show_form.html.erb @@ -1,6 +1,4 @@ -<%# @co_author_relations.each do |co_author_relation| %> - - + + -<%# end %> diff --git a/app/views/desktop/co_author_relations/index.html.erb b/app/views/desktop/co_author_relations/index.html.erb index 0b91d143d..24791349c 100644 --- a/app/views/desktop/co_author_relations/index.html.erb +++ b/app/views/desktop/co_author_relations/index.html.erb @@ -12,6 +12,8 @@ - <%= render :partial => 'show_form', :collection => @co_author_relations %> + <% @co_author_relations.each do |co_author_relation| %> + <%= render :partial => 'show_form', locals: {:co_author_relation => co_author_relation} %> + <% end %>
    <%= show_form.relation %><%= link_to 'Destroy', desktop_co_author_relation_path(show_form), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %><%= co_author_relation.relation %><%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %>
    From 4f31b1362b18bbe6ed27f2d1646abd4ea517bd8f Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 15:09:58 +0800 Subject: [PATCH 40/64] fixed new co-author relation bug.... --- app/controllers/desktop/co_author_relations_controller.rb | 5 +++-- app/views/desktop/co_author_relations/_show_form.html.erb | 2 ++ app/views/desktop/co_author_relations/index.html.erb | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/desktop/co_author_relations_controller.rb b/app/controllers/desktop/co_author_relations_controller.rb index 787ad36cc..cb01915e4 100644 --- a/app/controllers/desktop/co_author_relations_controller.rb +++ b/app/controllers/desktop/co_author_relations_controller.rb @@ -14,10 +14,11 @@ class Desktop::CoAuthorRelationsController < ApplicationController def create @new_relation = CoAuthorRelation.new(params[:co_author_relation]) + @co_author_relations = CoAuthorRelation.all if @new_relation.save - newv = render_to_string :partial=>"show_form", :object=>@new_relation - render json: {success:true, msg: "New Relation successfully saved!","newvalue"=>newv}.to_json + newv = render_to_string partial: "show_form", object: @co_author_relations + render json: {success: true, msg: "New Relation successfully saved!", newvalue: newv}.to_json else error_msg = @new_relation.errors.full_messages.join("
    ") render json: {success: false, msg: error_msg}.to_json diff --git a/app/views/desktop/co_author_relations/_show_form.html.erb b/app/views/desktop/co_author_relations/_show_form.html.erb index bdb9f72e6..d3c803d33 100644 --- a/app/views/desktop/co_author_relations/_show_form.html.erb +++ b/app/views/desktop/co_author_relations/_show_form.html.erb @@ -1,4 +1,6 @@ + <% @co_author_relations.each do |co_author_relation| %> <%= co_author_relation.relation %> <%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %> + <% end %> diff --git a/app/views/desktop/co_author_relations/index.html.erb b/app/views/desktop/co_author_relations/index.html.erb index 24791349c..157db9428 100644 --- a/app/views/desktop/co_author_relations/index.html.erb +++ b/app/views/desktop/co_author_relations/index.html.erb @@ -12,8 +12,6 @@ - <% @co_author_relations.each do |co_author_relation| %> - <%= render :partial => 'show_form', locals: {:co_author_relation => co_author_relation} %> - <% end %> + <%= render :partial => 'show_form'%> From 05027afa6345113912b00d2d9af927c62c59d74a Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 15:33:47 +0800 Subject: [PATCH 41/64] make journal list easy to read --- app/controllers/desktop/journal_lists_controller.rb | 3 +-- app/views/desktop/app_manager.html.erb | 0 app/views/desktop/desktop.html.erb | 0 app/views/desktop/index.html.erb | 0 app/views/desktop/journal_lists/index.html.erb | 5 ++++- 5 files changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 app/views/desktop/app_manager.html.erb mode change 100755 => 100644 app/views/desktop/desktop.html.erb mode change 100755 => 100644 app/views/desktop/index.html.erb diff --git a/app/controllers/desktop/journal_lists_controller.rb b/app/controllers/desktop/journal_lists_controller.rb index 8605b47d5..4ced50553 100644 --- a/app/controllers/desktop/journal_lists_controller.rb +++ b/app/controllers/desktop/journal_lists_controller.rb @@ -7,8 +7,7 @@ class Desktop::JournalListsController < ApplicationController [ j.journal_title, j.journal_level_type_ids.map do |type| level_types.find(type).title - end.join(",") - ].join(" -- ") + end] end @journal_lists = all_journal_lists.uniq diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb old mode 100755 new mode 100644 diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb old mode 100755 new mode 100644 diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb old mode 100755 new mode 100644 diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb index fad6ca669..776f8dccc 100644 --- a/app/views/desktop/journal_lists/index.html.erb +++ b/app/views/desktop/journal_lists/index.html.erb @@ -10,9 +10,12 @@
      <% end %> +
    • - <%= journal_list %> + <% title, level = journal_list %> + <%= title %> -- <%= level.join(",") %>
    • + <% if ( i % 5 ) == 4 %>
    From 6c33d353ba8abeec7e81e54ea8de1b4559b77b29 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 15:34:21 +0800 Subject: [PATCH 42/64] make journal list easy to read --- app/views/desktop/journal_lists/_form.html.erb | 17 ----------------- app/views/desktop/journal_lists/edit.html.erb | 6 ------ app/views/desktop/journal_lists/new.html.erb | 5 ----- app/views/desktop/journal_lists/show.html.erb | 5 ----- 4 files changed, 33 deletions(-) delete mode 100644 app/views/desktop/journal_lists/_form.html.erb delete mode 100644 app/views/desktop/journal_lists/edit.html.erb delete mode 100644 app/views/desktop/journal_lists/new.html.erb delete mode 100644 app/views/desktop/journal_lists/show.html.erb diff --git a/app/views/desktop/journal_lists/_form.html.erb b/app/views/desktop/journal_lists/_form.html.erb deleted file mode 100644 index ac7f7ac68..000000000 --- a/app/views/desktop/journal_lists/_form.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -<%= form_for(@desktop_journal_list) do |f| %> - <% if @desktop_journal_list.errors.any? %> -
    -

    <%= pluralize(@desktop_journal_list.errors.count, "error") %> prohibited this desktop_journal_list from being saved:

    - -
      - <% @desktop_journal_list.errors.full_messages.each do |msg| %> -
    • <%= msg %>
    • - <% end %> -
    -
    - <% end %> - -
    - <%= f.submit %> -
    -<% end %> diff --git a/app/views/desktop/journal_lists/edit.html.erb b/app/views/desktop/journal_lists/edit.html.erb deleted file mode 100644 index d628e8953..000000000 --- a/app/views/desktop/journal_lists/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

    Editing desktop_journal_list

    - -<%= render 'form' %> - -<%= link_to 'Show', @desktop_journal_list %> | -<%= link_to 'Back', desktop_journal_lists_path %> diff --git a/app/views/desktop/journal_lists/new.html.erb b/app/views/desktop/journal_lists/new.html.erb deleted file mode 100644 index 95017361a..000000000 --- a/app/views/desktop/journal_lists/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

    New desktop_journal_list

    - -<%= render 'form' %> - -<%= link_to 'Back', desktop_journal_lists_path %> diff --git a/app/views/desktop/journal_lists/show.html.erb b/app/views/desktop/journal_lists/show.html.erb deleted file mode 100644 index d454b78f3..000000000 --- a/app/views/desktop/journal_lists/show.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

    <%= notice %>

    - - -<%= link_to 'Edit', edit_desktop_journal_list_path(@desktop_journal_list) %> | -<%= link_to 'Back', desktop_journal_lists_path %> From 4ae7ac838807de09a38f682b32838230b98493c9 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 5 Dec 2012 16:00:36 +0800 Subject: [PATCH 43/64] clean route table about desktop --- app/controllers/desktop/co_authors_controller.rb | 9 --------- app/controllers/desktop/journal_lists_controller.rb | 1 - app/controllers/desktop/journal_pages_controller.rb | 11 ----------- config/routes.rb | 8 ++++---- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/app/controllers/desktop/co_authors_controller.rb b/app/controllers/desktop/co_authors_controller.rb index c027a162c..913900716 100644 --- a/app/controllers/desktop/co_authors_controller.rb +++ b/app/controllers/desktop/co_authors_controller.rb @@ -8,15 +8,6 @@ class Desktop::CoAuthorsController < ApplicationController end end - def show - @co_author = CoAuthor.find(params[:id]) - - respond_to do |format| - format.html { redirect_to desktop_co_authors_url, :layout => false } - format.json { render json: @co_author } - end - end - def new @co_author = CoAuthor.new @co_author_relations = CoAuthorRelation.all diff --git a/app/controllers/desktop/journal_lists_controller.rb b/app/controllers/desktop/journal_lists_controller.rb index 4ced50553..2667a5a77 100644 --- a/app/controllers/desktop/journal_lists_controller.rb +++ b/app/controllers/desktop/journal_lists_controller.rb @@ -1,5 +1,4 @@ class Desktop::JournalListsController < ApplicationController - def index level_types = JournalLevelType.all all_journal_lists = WritingJournal.where(create_user_id: current_user.id) diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb index 5775be0a4..8a2312b85 100644 --- a/app/controllers/desktop/journal_pages_controller.rb +++ b/app/controllers/desktop/journal_pages_controller.rb @@ -1,6 +1,4 @@ class Desktop::JournalPagesController < ApplicationController - #before_filter :check_for_cancel, :only => [:create, :update] - def index @writing_journal = WritingJournal.where(create_user_id: current_user.id) @level_types = JournalLevelType.all @@ -10,9 +8,6 @@ class Desktop::JournalPagesController < ApplicationController end end - def show - end - def new @writing_journal = WritingJournal.new @level_types = JournalLevelType.all @@ -109,10 +104,4 @@ class Desktop::JournalPagesController < ApplicationController render json: JSON.pretty_generate(data) end - private - - def check_for_cancel - if params[:commit] == "Cancel" - end - end end diff --git a/config/routes.rb b/config/routes.rb index 2a9d98fce..32d8430a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,10 +180,10 @@ Orbit::Application.routes.draw do match '/widget_layout' => 'desktop#widget_layout' match '/temp_func/'=>'desktop#temp_func' - resources :journal_pages - resources :journal_lists - resources :co_authors - resources :co_author_relations + resources :journal_pages, except: :show + resources :journal_lists, only: :index + resources :co_authors, except: :show + resources :co_author_relations, except: :show end # namespace :desktop_publications do From d03f5dc1fff605f5d7d7b2bad54847950aec3222 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 5 Dec 2012 16:10:15 +0800 Subject: [PATCH 44/64] 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 4af5715ce..f0d74f1fe 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 8f591e1fb..112ae64bd 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 776f8dccc..d9b7de3d8 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 3a513034c..94810500f 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 @@
      -
    -
    +
    -->
    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" %> - - - - - +
-
+
+