ENH: Refs #0299. Add a horizontal rule between global actions and fol…

…er/item specific actions. Remove the arbitrary horizontal rule among folder/item actions.
midasplatform · Oct 31, 2011 · 71cd013 · 71cd013
1 parent da9b9ba
commit 71cd013
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -204,7 +204,7 @@
       $('div.viewAction ul').fadeOut('fast',function()
       {
         $('div.viewAction ul').html('');
-        var html='';
+        var html='';   
         if(type=='community')
           {
             html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/view.png"/> <a href="'+json.global.webroot+'/community/'+element+'">'+json.browse.view+'</a></li>';            
@@ -216,7 +216,6 @@
 
             if(policy>=1)
               {
-              html+='<hr/>';
               html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/FileTree/directory.png"/> <a onclick="createNewFolder('+element+');">'+json.browse.createFolder+'</a></li>';
               html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/upload.png"/> <a rel="'+json.global.webroot+'/upload/simpleupload/?parent='+element+'" class="uploadInFolder">'+json.browse.uploadIn+'</a></li>';
               html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/edit.png"/> <a onclick="editFolder('+element+');">'+json.browse.edit+'</a></li>';
@@ -233,7 +232,6 @@
             html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/download.png"/> <a href="'+json.global.webroot+'/download?items='+element+'">'+json.browse.downloadLastest+'</a></li>';
             if(policy>=1)
               {
-              html+='<hr/>';
               html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/share.png"/> <a  type="item" element="'+element+'" class="sharingLink">'+json.browse.share+'</a></li>';
               html+='<li class="removeItemLi"><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/close.png"/> <a onclick="removeItem('+element+');">'+json.browse['removeItem']+'</a></li>'; 
               }   

diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml
@@ -215,7 +215,7 @@ foreach($this->customCSSs as $Uris)
       ?>
    </div>
 
-    <div class="sideElementFirst viewAction">
+    <div class="sideElementActions viewAction">
       <ul>
         <li>
 

diff --git 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
     ?>
 
 
-    <div class="sideElementFirst viewAction">
+    <div class="sideElementActions viewAction">
       <ul>
         <li>
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,7 +215,7 @@ foreach($this->customCSSs as $Uris) @@
           ?>
        </div>
-        <div class="sideElementFirst viewAction">
+        <div class="sideElementActions viewAction">
           <ul>
             <li>
@@ Expand Down @@