From 71cd013f13495c8951d4be9153e5c124adcede82 Mon Sep 17 00:00:00 2001 From: Yuzheng Zhou Date: Wed, 26 Oct 2011 13:08:16 -0400 Subject: [PATCH] ENH: Refs #0299. Add a horizontal rule between global actions and foler/item specific actions. Remove the arbitrary horizontal rule among folder/item actions. --- core/public/css/layout/view.css | 9 ++++++++- core/public/js/common/common.browser.js | 4 +--- core/views/community/view.phtml | 2 +- core/views/user/userpage.phtml | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/core/public/css/layout/view.css b/core/public/css/layout/view.css index c3927ab90..5be775ed7 100644 --- a/core/public/css/layout/view.css +++ b/core/public/css/layout/view.css @@ -83,6 +83,13 @@ div.viewSideBar div.sideElement{ div.viewSideBar div.sideElementFirst{ border-top:none !important; border-bottom: 1px solid white; + padding-bottom: 5px; +} + +div.viewSideBar div.sideElementActions{ + border-top:1px solid #DAD8D4; + border-bottom: 1px solid white; + padding-top: 5px; padding-bottom: 10px; } @@ -92,7 +99,7 @@ div.viewSideBar div.sideElementLast{ border-top: 1px solid #DAD8D4; } -div.viewSideBar div.sideElement ul,div.viewSideBar div.sideElementFirst ul,div.viewSideBar div.sideElementLast ul{ +div.viewSideBar div.sideElement ul,div.viewSideBar div.sideElementFirst ul, div.viewSideBar div.sideElementActions ul, div.viewSideBar div.sideElementLast ul{ list-style:none; margin:0; padding: 0; diff --git a/core/public/js/common/common.browser.js b/core/public/js/common/common.browser.js index 5c5806e7a..d692295ce 100644 --- a/core/public/js/common/common.browser.js +++ b/core/public/js/common/common.browser.js @@ -204,7 +204,7 @@ $('div.viewAction ul').fadeOut('fast',function() { $('div.viewAction ul').html(''); - var html=''; + var html=''; if(type=='community') { html+='
  • '+json.browse.view+'
  • '; @@ -216,7 +216,6 @@ if(policy>=1) { - html+='
    '; html+='
  • '+json.browse.createFolder+'
  • '; html+='
  • '+json.browse.uploadIn+'
  • '; html+='
  • '+json.browse.edit+'
  • '; @@ -233,7 +232,6 @@ html+='
  • '+json.browse.downloadLastest+'
  • '; if(policy>=1) { - html+='
    '; html+='
  • '; html+='
  • '+json.browse['removeItem']+'
  • '; } diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml index 93069a0ea..48a0f5ecf 100644 --- a/core/views/community/view.phtml +++ b/core/views/community/view.phtml @@ -215,7 +215,7 @@ foreach($this->customCSSs as $Uris) ?> -
    +
    • diff --git a/core/views/user/userpage.phtml b/core/views/user/userpage.phtml index 6ecba78c3..68fcaf694 100644 --- a/core/views/user/userpage.phtml +++ b/core/views/user/userpage.phtml @@ -205,7 +205,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro ?> -
      +