aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-12-30 21:04:48 +0100
committermarijus <mario@mariovavti.com>2014-12-30 21:04:48 +0100
commit4edc9a696bf0b7d84f2f7d8caa1b5d95902cf09f (patch)
tree6fd32c4fe4d319ed30450ba3791dea9f4eb5e49c
parent8e034a3b6b67a9aaa20fe9db671350e198fe7c42 (diff)
downloadvolse-hubzilla-4edc9a696bf0b7d84f2f7d8caa1b5d95902cf09f.tar.gz
volse-hubzilla-4edc9a696bf0b7d84f2f7d8caa1b5d95902cf09f.tar.bz2
volse-hubzilla-4edc9a696bf0b7d84f2f7d8caa1b5d95902cf09f.zip
design fixes for photos, files and random fixes
-rw-r--r--include/RedDAV/RedBrowser.php6
-rw-r--r--view/tpl/attach_edit.tpl43
-rwxr-xr-xview/tpl/photos_upload.tpl35
3 files changed, 51 insertions, 33 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index d07f60083..709f6339b 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -342,6 +342,7 @@ class RedBrowser extends DAV\Browser\Plugin {
'application/octet-stream' => 'icon-file-alt',
//Text
+ 'text/plain' => 'icon-file-text-alt',
'application/msword' => 'icon-file-text-alt',
'application/pdf' => 'icon-file-text-alt',
'application/vnd.oasis.opendocument.text' => 'icon-file-text-alt',
@@ -365,6 +366,11 @@ class RedBrowser extends DAV\Browser\Plugin {
'audio/mpeg' => 'icon-music',
'audio/wav' => 'icon-music',
'application/ogg' => 'icon-music',
+
+ //Video
+ 'video/quicktime' => 'icon-film',
+
+
);
$iconFromType = 'icon-file-alt';
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 033ee40a7..82f2a7628 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,6 +1,10 @@
<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
+ <input type="hidden" name="channelnick" value="{{$channelnick}}" />
+ <input type="hidden" name="filehash" value="{{$file.hash}}" />
+ <input type="hidden" name="uid" value="{{$uid}}" />
+ <input type="hidden" name="fileid" value="{{$file.id}}" />
- <div id="attach-edit-tools" class="btn-group form-group">
+ <div id="attach-edit-tools-share" class="btn-group form-group">
{{if !$isadir}}
<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs">
<i class="icon-paperclip jot-icons"></i>
@@ -10,28 +14,25 @@
<i class="icon-share jot-icons"></i>
</button>
</div>
- <div id="attach-edit-perms" class="btn-group form-group pull-right">
- <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
- </button>
- <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
- {{$submit}}
- </button>
+ <div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}">
+ {{if $isadir}}
+ <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons">
+ <label class="btn btn-default btn-xs" title="{{$recurse}}">
+ <input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i>
+ </label>
+ </div>
+ {{/if}}
+ <div id="attach-edit-perms" class="btn-group">
+ <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+ <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+ </button>
+ <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
+ {{$submit}}
+ </button>
+ </div>
</div>
- {{$aclselect}}
- <input type="hidden" name="channelnick" value="{{$channelnick}}" />
- <input type="hidden" name="filehash" value="{{$file.hash}}" />
- <input type="hidden" name="uid" value="{{$uid}}" />
- <input type="hidden" name="fileid" value="{{$file.id}}" />
-
- {{if $isadir}}
- <div class="form-group">
- <label id="attach-edit-recurse-text" class="checkbox-inline" for="attach-recurse-input" >
- <input class="checkbox-inline" id="attach-recurse-input" type="checkbox" name="recurse" value="1" />{{$recurse}}
- </label>
- </div>
- {{/if}}
+ {{$aclselect}}
<div id="link-code" class="form-group">
<label for="">{{$cpldesc}}</label>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 0b3a0ae81..6cd7e3eb9 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -21,26 +21,37 @@
<div class="form-group">
<input id="photos-upload-choose" type="file" name="userfile" />
</div>
- <div class="btn-group pull-right">
- <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
- </button>
- <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
- </div>
- {{/if}}
+ <div class="pull-right btn-group form-group">
+ <div class="btn-group" data-toggle="buttons">
+ <label class="btn btn-default btn-sm" title="{{$nosharetext}}">
+ <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i>
+ </label>
+ </div>
+ <div class="btn-group">
+ {{if $lockstate}}
+ <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+ <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ </button>
+ {{/if}}
+ <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+ </div>
- <div class="checkbox pull-left">
- <label class="checkbox-inline" for="photos-upload-noshare" >
- <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}}
- </label>
</div>
+ {{/if}}
<div class="clear"></div>
{{if $uploader}}
- <div id="photos-upload-perms" class="pull-right">
+ <div id="photos-upload-perms" class="btn-group pull-right">
+ <div class="btn-group" data-toggle="buttons">
+ <label class="btn btn-default btn-sm" title="{{$nosharetext}}">
+ <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i>
+ </label>
+ </div>
+ {{if $lockstate}}
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
</button>
+ {{/if}}
<div class="pull-right">
{{$uploader}}
</div>