aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2014-05-05 13:54:56 +0000
committerjeroenpraat <jeroenpraat@xs4all.nl>2014-05-05 13:54:56 +0000
commitd93df86298450512853e4085f519486eea2d8468 (patch)
tree5cb17095d0ce4571b08ae15872a35b3ddca7f563
parent806f1f0fa134cc0168c9f86aaf10b8357fc19905 (diff)
downloadvolse-hubzilla-d93df86298450512853e4085f519486eea2d8468.tar.gz
volse-hubzilla-d93df86298450512853e4085f519486eea2d8468.tar.bz2
volse-hubzilla-d93df86298450512853e4085f519486eea2d8468.zip
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.
-rw-r--r--include/reddav.php16
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/tpl/attach_edit.tpl20
3 files changed, 27 insertions, 23 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>&nbsp;</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>&nbsp;</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..579ec9958 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: auto;
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: 18px;
+}
+
/* bootstrap overrides */
blockquote {
font-size: $body_font_size;
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>