Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 71cd013

Browse files
committed
ENH: Refs #0299. Add a horizontal rule between global actions and foler/item specific actions.
Remove the arbitrary horizontal rule among folder/item actions.
1 parent da9b9ba commit 71cd013

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

core/public/css/layout/view.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ div.viewSideBar div.sideElement{
8383
div.viewSideBar div.sideElementFirst{
8484
border-top:none !important;
8585
border-bottom: 1px solid white;
86+
padding-bottom: 5px;
87+
}
88+
89+
div.viewSideBar div.sideElementActions{
90+
border-top:1px solid #DAD8D4;
91+
border-bottom: 1px solid white;
92+
padding-top: 5px;
8693
padding-bottom: 10px;
8794
}
8895

@@ -92,7 +99,7 @@ div.viewSideBar div.sideElementLast{
9299
border-top: 1px solid #DAD8D4;
93100
}
94101

95-
div.viewSideBar div.sideElement ul,div.viewSideBar div.sideElementFirst ul,div.viewSideBar div.sideElementLast ul{
102+
div.viewSideBar div.sideElement ul,div.viewSideBar div.sideElementFirst ul, div.viewSideBar div.sideElementActions ul, div.viewSideBar div.sideElementLast ul{
96103
list-style:none;
97104
margin:0;
98105
padding: 0;

core/public/js/common/common.browser.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
$('div.viewAction ul').fadeOut('fast',function()
205205
{
206206
$('div.viewAction ul').html('');
207-
var html='';
207+
var html='';
208208
if(type=='community')
209209
{
210210
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 @@
216216

217217
if(policy>=1)
218218
{
219-
html+='<hr/>';
220219
html+='<li><img alt="" src="'+json.global.coreWebroot+'/public/images/FileTree/directory.png"/> <a onclick="createNewFolder('+element+');">'+json.browse.createFolder+'</a></li>';
221220
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>';
222221
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 @@
233232
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>';
234233
if(policy>=1)
235234
{
236-
html+='<hr/>';
237235
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>';
238236
html+='<li class="removeItemLi"><img alt="" src="'+json.global.coreWebroot+'/public/images/icons/close.png"/> <a onclick="removeItem('+element+');">'+json.browse['removeItem']+'</a></li>';
239237
}

core/views/community/view.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ foreach($this->customCSSs as $Uris)
215215
?>
216216
</div>
217217

218-
<div class="sideElementFirst viewAction">
218+
<div class="sideElementActions viewAction">
219219
<ul>
220220
<li>
221221

core/views/user/userpage.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
205205
?>
206206

207207

208-
<div class="sideElementFirst viewAction">
208+
<div class="sideElementActions viewAction">
209209
<ul>
210210
<li>
211211

0 commit comments

Comments
 (0)