aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/css/mod_sharedwithme.css24
-rw-r--r--view/de/lostpass_eml.tpl6
-rw-r--r--view/tpl/cloud_header.tpl2
-rw-r--r--view/tpl/sharedwithme.tpl24
5 files changed, 56 insertions, 4 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 7a5ffc2f7..8bc71bb6d 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -195,6 +195,10 @@ a.wall-item-name-link {
clear: both;
}
+.shared_header {
+ margin-bottom: 20px;
+}
+
/* comment_item */
.comment-edit-text-empty, .comment-edit-text-full {
diff --git a/view/css/mod_sharedwithme.css b/view/css/mod_sharedwithme.css
new file mode 100644
index 000000000..79fe0d7a9
--- /dev/null
+++ b/view/css/mod_sharedwithme.css
@@ -0,0 +1,24 @@
+#cloud-index {
+ width: 100%;
+}
+
+#cloud-index td:nth-child(1){
+ padding: 7px 3px 7px 10px;
+}
+
+#cloud-index th:nth-child(4),
+#cloud-index td:nth-child(4){
+ padding: 7px 3px;
+ white-space: nowrap;
+}
+
+#cloud-index th:nth-child(5),
+#cloud-index td:nth-child(5){
+ padding: 7px 10px 7px 7px;
+ white-space: nowrap;
+}
+
+.cloud-index-tool {
+ padding: 7px 10px;
+}
+
diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl
index 2175d2e5d..02a71b77a 100644
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
@@ -1,6 +1,6 @@
Hallo {{$username}},
- auf {{$sitename} wurde eine Rücksetzung Deines Passwortes angefordert.
+auf {{$sitename}} wurde eine Rücksetzung Deines Passwortes angefordert.
Bitte klicke auf den Link unten, um diese Anforderung zu bestätigen,
oder kopiere den Link und füge ihn in die Adresszeile Deines Browsers ein.
@@ -27,6 +27,4 @@ Username: {{$email}}
Viele Grüße,
- der Administrator von {{$sitename}}
-
- \ No newline at end of file
+der Administrator von {{$sitename}}
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index 403323085..c75815d07 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -1,7 +1,9 @@
<div class="section-title-wrapper">
{{if $actionspanel}}
<div class="pull-right">
+ {{if $is_owner}}
<a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i>&nbsp;{{$shared}}</a>
+ {{/if}}
<button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;{{$create}}</button>
<button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
</div>
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
new file mode 100644
index 000000000..1aeb9d4d7
--- /dev/null
+++ b/view/tpl/sharedwithme.tpl
@@ -0,0 +1,24 @@
+<div class="section-title-wrapper">
+ <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
+ <h2>{{$header}}</h2>
+</div>
+<div class="generic-content-wrapper section-content-wrapper-np">
+ <table id="cloud-index">
+ <tr>
+ <th width="1%"></th>
+ <th width="92%">{{$name}}</th>
+ <th width="1%"></th>
+ <th width="1%" class="hidden-xs">{{$size}}</th>
+ <th width="1%" class="hidden-xs">{{$lastmod}}</th>
+ </tr>
+ {{foreach $items as $item}}
+ <tr id="cloud-index-{{$item.id}}">
+ <td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
+ <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a></td>
+ <td class="cloud-index-tool"><a href="/sharedwithme/{{$item.id}}/drop" title="{{$drop}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td>
+ <td class="hidden-xs">{{$item.objfilesize}}</td>
+ <td class="hidden-xs">{{$item.objedited}}</td>
+ </tr>
+ {{/foreach}}
+ </table>
+</div>