harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some wrapping problems when the user has set a larger font size. And some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page.

Browse Source
This commit is contained in:
jeroenpraat 2014-05-05 13:54:56 +00:00
parent 806f1f0fa1
commit d93df86298
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/reddav.php
View File

@ -1038,6 +1038,14 @@ class RedBrowser extends DAV\Browser\Plugin {
public function htmlActionsPanel(DAV\INode $node, &$output) { 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>&nbsp;</td></tr>';
}
}
if (!$node instanceof DAV\ICollection) if (!$node instanceof DAV\ICollection)
return; return;
@ -1062,14 +1070,6 @@ class RedBrowser extends DAV\Browser\Plugin {
</form> </form>
</td></tr>'; </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>&nbsp;</td></tr><tr><td colspan="2"><a href="filestorage/' . $channel['channel_address'] . '" >' . t('Edit File properties') . '</a></td></tr>';
}
}
} }
/** /**

14
view/theme/redbasic/css/style.css
View File

@ -386,6 +386,7 @@ aside li {
.vcard dl { .vcard dl {
clear: both; clear: both;
word-wrap:break-word;
} }
.vcard-profile-edit-icon { .vcard-profile-edit-icon {
@ -1011,7 +1012,7 @@ aside li {
.profile-match-name { .profile-match-name {
text-align: center; text-align: center;
width: 120px; width: 120px;
height: 18px; height: 1.5em;
overflow: hidden !important; overflow: hidden !important;
} }
@ -1033,7 +1034,7 @@ aside li {
float: left; float: left;
padding: 10px; padding: 10px;
width: 120px; width: 120px;
height: 120px; min-height: auto;
scroll: auto; scroll: auto;
} }
#profile-match-wrapper-end { #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; color: $nav_active_icon_colour;
} }
/* Files */
#attach-edit-perms {
margin-top: 25px;
margin-bottom: 20px;
font-weight: bold;
font-size: 18px;
}
/* bootstrap overrides */ /* bootstrap overrides */
blockquote { blockquote {
font-size: $body_font_size; font-size: $body_font_size;

20
view/tpl/attach_edit.tpl
View File

@ -1,11 +1,13 @@
<div id="attach-edit-backlink">< <a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div>
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
<h2>{{$file.filename}}</h2> <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>
<div id="attach-edit-backlink"><a href="filestorage/{{$channelnick}}">{{$backlink}}</a></div> </button>
{{$aclselect}} {{$file.filename}}
</div>
<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
@ -14,7 +16,6 @@
<input type="hidden" name="uid" value="{{$uid}}" /> <input type="hidden" name="uid" value="{{$uid}}" />
<input type="hidden" name="fileid" value="{{$file.id}}" /> <input type="hidden" name="fileid" value="{{$file.id}}" />
{{if $isadir}} {{if $isadir}}
<div id="attach-edit-recurse" > <div id="attach-edit-recurse" >
<label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label> <label id="attach-edit-recurse-text" for="attach-recurse-input" >{{$recurse}}</label>
@ -28,13 +29,6 @@
<div class="cut-paste-desc">{{$cpldesc}}</div> <div class="cut-paste-desc">{{$cpldesc}}</div>
<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> <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> <div class="clear"></div>
<input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" /> <input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" />
</form> </form>