aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-12 13:13:22 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-12 13:13:22 +0200
commit7c8b9397ae8fc83ce96d9905992f40e6fde4663a (patch)
treef1ac493549157ab951bd4642d7e291ae2d78de04 /view
parente64de798b578e2c6ed1856749fb8448dcc6ea080 (diff)
downloadvolse-hubzilla-7c8b9397ae8fc83ce96d9905992f40e6fde4663a.tar.gz
volse-hubzilla-7c8b9397ae8fc83ce96d9905992f40e6fde4663a.tar.bz2
volse-hubzilla-7c8b9397ae8fc83ce96d9905992f40e6fde4663a.zip
reverse file activity logic
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css3
-rw-r--r--view/tpl/attach_edit.tpl34
2 files changed, 11 insertions, 26 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index dced812b7..d94a08b3e 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -19,7 +19,8 @@ code {
display:none;
}
-#jot-title-wrap input {
+#jot-title-wrap input,
+#jot-pagetitle-wrap input {
padding: 8px;
margin-bottom: 5px;
}
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 4a438e8fd..f4be58db0 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -3,7 +3,8 @@
<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}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
+ {{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
<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" title="{{$attach_btn_title}}">
@@ -14,31 +15,14 @@
<i class="icon-share jot-icons"></i>
</button>
</div>
- <div id="attach-edit-tools-perms" class="form-group pull-right btn-group">
- {{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}}
- {{if !$isadir}}
- <div id="attach-edit-activity" class="btn-group" data-toggle="buttons">
- <label class="btn btn-default btn-xs" title="{{$activity_btn_title}}">
- <input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle 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 id="attach-edit-perms" class="btn-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>
-
{{$aclselect}}
<div id="link-code" class="form-group">