From 756bfa563b9f409b4259b97f55326df4566cab1b Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 6 Dec 2012 03:42:20 +0800 Subject: [PATCH] view update --- .../javascripts/desktop/journal_pages.js.erb | 10 ++--- app/assets/stylesheets/desktopmain.css | 40 +++++++++++++++++-- app/views/desktop/co_authors/index.html.erb | 14 +++---- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb index dceffd3fa..829115844 100644 --- a/app/assets/javascripts/desktop/journal_pages.js.erb +++ b/app/assets/javascripts/desktop/journal_pages.js.erb @@ -116,7 +116,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+journal.title+'
    '+paper.title+'
    Edit Delete
    • '); + li = $('
  • '+journal.title+'
    '+paper.title+'
    Edit Delete
    • '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -145,7 +145,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // var img = $('
    '+thistitle+'
    '); li.append(img); }) - li.append('Edit Delete'); + li.append('
    Edit Delete
    '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -164,7 +164,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+paper.title+'
    '+paper.keywords+'
    Edit Delete
    • '); + li = $('
  • '+paper.title+'
    '+paper.keywords+'
    Edit Delete
    • '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -184,7 +184,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+paper.title+'
    Edit Delete
    • '); + li = $('
  • '+paper.title+'
    Edit Delete
    • '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -203,7 +203,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+paper.title+'
    '+paper.abstract+'
    Edit Delete
    • '); + li = $('
  • '+paper.title+'
    '+paper.abstract+'
    Edit Delete
    • '); column.find("ul").append(li); $("#journal_p div#paper_list div.overview").append(column); column = $('
    '); diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 232123e64..465430131 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -646,7 +646,7 @@ a:focus { outline: none; } .list_t_title { font-size: 15px; font-family: Arial; - margin-bottom: 10px; + margin-bottom: 6px; color: #333; } .list_t_des { @@ -654,7 +654,7 @@ a:focus { outline: none; } line-height: 1.5em; color: #999; font-family: Arial, sans-serif; - margin-bottom: 10px; + margin-bottom: 4px; } /* Connection Page */ @@ -714,6 +714,12 @@ a:focus { outline: none; } float: left; margin-left: -30px; } +#paper_list .list_item_function a { + display: inline-block; + padding: 4px; + font-family: Arial, sans-serif; + font-size: 11px; +} .list_item_action a { display: block; width: 20px; @@ -776,10 +782,38 @@ a:focus { outline: none; } /* Journal Co-Author */ #co_author {} #co_author .list_t_item { - height: 86px; + height: 110px; } +#co_author .list_item_function {} #co_author .list_item_function a { display: inline-block; + padding: 4px; + font-family: Arial, sans-serif; + font-size: 11px; +} +#co_author .g_col:first-child { + margin-left: 0; + padding-left: 10px; + border: none; +} +#co_author .g_col { + width: 300px; + height: 456px; + margin-left: 12px; + padding-left: 12px; + border-left: solid 1px #EEE; +} +#co_author .info { + font-family: Arial, sans-serif; +} +#co_author .info li { + margin-bottom: 8px; + color: #999; +} +#co_author .info .name { + font-size: 18px; + line-height: 24px; + color: #333; } /* App */ diff --git a/app/views/desktop/co_authors/index.html.erb b/app/views/desktop/co_authors/index.html.erb index d30f425b8..ec9e156d0 100644 --- a/app/views/desktop/co_authors/index.html.erb +++ b/app/views/desktop/co_authors/index.html.erb @@ -9,22 +9,22 @@
    <% @co_authors.each_with_index do |co_author,i| %> - <% if ( i % 5 ) == 0 %> + <% if ( i % 4 ) == 0 %>
      <% end %>
      • -
      • <%= 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?%>
        • +
      • <%= co_author.co_author %>
        • +
        • +
      • <%= @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 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit admbg2 admtxt" %> + <%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete admbg2 admtxt" %>
      • - <% if ( i % 5 ) == 4 %> + <% if ( i % 4 ) == 3 %>
    <% end %>