diff options
| -rw-r--r-- | include/reddav.php | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 39 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 6 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 20 |
4 files changed, 47 insertions, 34 deletions
diff --git a/include/reddav.php b/include/reddav.php index 03cfe1aab..0650531dd 100644 --- a/include/reddav.php +++ b/include/reddav.php @@ -1038,6 +1038,14 @@ class RedBrowser extends DAV\Browser\Plugin { public function htmlActionsPanel(DAV\INode $node, &$output) { + + if($this->auth->owner_id && $this->auth->owner_id == $this->auth->channel_id) { + $channel = get_app()->get_channel(); + if($channel) { + $output .= '<tr><td colspan="2"><a href="filestorage/' . $channel['channel_address'] . '" >' . t('Edit File properties') . '</a></td></tr><tr><td> </td></tr>'; + } + } + if (!$node instanceof DAV\ICollection) return; @@ -1062,14 +1070,6 @@ class RedBrowser extends DAV\Browser\Plugin { </form> </td></tr>'; - - if($this->auth->owner_id && $this->auth->owner_id == $this->auth->channel_id) { - $channel = get_app()->get_channel(); - if($channel) { - $output .= '<tr><td> </td></tr><tr><td colspan="2"><a href="filestorage/' . $channel['channel_address'] . '" >' . t('Edit File properties') . '</a></td></tr>'; - } - } - } /** diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a4373ed37..a8baa4877 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -386,6 +386,7 @@ aside li { .vcard dl { clear: both; + word-wrap:break-word; } .vcard-profile-edit-icon { @@ -1011,7 +1012,7 @@ aside li { .profile-match-name { text-align: center; width: 120px; - height: 18px; + height: 1.5em; overflow: hidden !important; } @@ -1033,7 +1034,7 @@ aside li { float: left; padding: 10px; width: 120px; - height: 120px; + min-height: 120px; scroll: auto; } #profile-match-wrapper-end { @@ -2143,6 +2144,15 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ color: $nav_active_icon_colour; } +/* Files */ + +#attach-edit-perms { + margin-top: 25px; + margin-bottom: 20px; + font-weight: bold; + font-size: 17px; +} + /* bootstrap overrides */ blockquote { font-size: $body_font_size; @@ -2243,33 +2253,42 @@ blockquote { } .nav-tabs{ - border-bottom:1px solid $navtabs_borderc !important; + border-bottom:1px solid $navtabs_borderc; } .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{ - color: $navtabs_fontcolour !important; + color: $navtabs_fontcolour; background-color: $navtabs_bgcolour; } .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid $navtabs_borderc !important; - border-bottom:1px solid transparent !important; - bottom: -1px !important; + border:1px solid $navtabs_borderc; + border-bottom:1px solid transparent; } .nav-tabs.nav-justified > li > a { - border-bottom: none; $navtabs_linkcolour } .nav-tabs > li > a:hover, .nav-tabs > li > a:focus { text-decoration: $navtabs_decohover; background-color: $navtabs_bgchover; - border-bottom: 1px solid $navtabs_bgchover; - border-color: $navtabs_bgchover; + border-color: transparent; + border-bottom-color: $navtabs_borderc; $navtabs_linkchover } +@media (min-width: 768px) { + .nav-tabs.nav-justified > li > a { + border-bottom: 1px solid $navtabs_borderc; + } + .nav-tabs.nav-justified > .active > a, + .nav-tabs.nav-justified > .active > a:hover, + .nav-tabs.nav-justified > .active > a:focus { + border-bottom-color: transparent; + } +} + .btn-default { background-color: $editbuttons_bgcolour; border-color: $editbuttons_bordercolour; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 4d892d356..698adaf4d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -94,11 +94,11 @@ if(! $a->install) { if (! $navmenu_bgimage) $navmenu_bgimage = ""; if (! $navtabs_borderc) - $navtabs_borderc = "#ddd"; + $navtabs_borderc = "rgba(204,204,204,0.8)"; if (! $navtabs_fontcolour) $navtabs_fontcolour = "#555"; if (! $navtabs_bgcolour) - $navtabs_bgcolour = "#fff"; + $navtabs_bgcolour = "rgba(254,254,254,0.4)"; if (! $navtabs_linkcolour) $navtabs_linkcolour = ""; if (! $navtabs_linkchover) @@ -106,7 +106,7 @@ if(! $a->install) { if (! $navtabs_decohover) $navtabs_decohover = "none"; if (! $navtabs_bgchover) - $navtabs_bgchover = "#eee"; + $navtabs_bgchover = "rgba(238,238,238,0.8)"; if (! $link_colour) $link_colour = "#428BCA"; if (! $banner_colour) diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 5d2703a2d..3a4f0dd2a 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,11 +1,13 @@ +<div id="attach-edit-backlink">< <a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div> <h1>{{$header}}</h1> -<h2>{{$file.filename}}</h2> - - -<div id="attach-edit-backlink"><a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div> - +<div id="attach-edit-perms" > +<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> +</button> +{{$aclselect}} {{$file.filename}} +</div> <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > @@ -14,7 +16,6 @@ <input type="hidden" name="uid" value="{{$uid}}" /> <input type="hidden" name="fileid" value="{{$file.id}}" /> - {{if $isadir}} <div id="attach-edit-recurse" > <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label> @@ -28,13 +29,6 @@ <div class="cut-paste-desc">{{$cpldesc}}</div> <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> -<div id="attach-edit-perms" > -<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> -</button> -{{$aclselect}} -</div> - <div class="clear"></div> <input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" /> </form> |