aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-17 11:20:22 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-17 11:20:22 +0200
commit61e4ee753dd0e823c47a5cf2e485f7f69fb4d125 (patch)
tree59479f4c5baf7e57d7ff56e8b2f21462db6c25f5 /view/tpl
parent10cc643f650b5ff0954ff988fbf768ea5e061571 (diff)
downloadvolse-hubzilla-61e4ee753dd0e823c47a5cf2e485f7f69fb4d125.tar.gz
volse-hubzilla-61e4ee753dd0e823c47a5cf2e485f7f69fb4d125.tar.bz2
volse-hubzilla-61e4ee753dd0e823c47a5cf2e485f7f69fb4d125.zip
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/edpost_head.tpl13
-rwxr-xr-xview/tpl/jot-header.tpl2
-rwxr-xr-xview/tpl/jot.tpl15
-rw-r--r--view/tpl/webpagelist.tpl2
4 files changed, 14 insertions, 18 deletions
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 890b746bf..20e597909 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1 +1,12 @@
-<h2>{{$title}}</h2>
+<div class="section-title-wrapper">
+ {{if $delete}}
+ <div class="pull-right">
+ <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+ </div>
+ {{/if}}
+ <h2>{{$title}}</h2>
+ <div class="clear"></div>
+</div>
+<div id="webpage-editor" class="section-content-tools-wrapper">
+ {{$editor}}
+</div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index f9ce65a86..4121882b7 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -108,8 +108,6 @@ function enableOnUser(){
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
- if($("#jot-attachment").val()) enableOnUser();
-
var upload_title = $('#wall-image-upload').attr('title');
var attach_title = $('#wall-file-upload').attr('title');
try {
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 24fea70f1..2fcd4d59b 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -176,20 +176,7 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
-<script type="text/javascript">
- $(function() {
- $('#datetimepicker1').datetimepicker({
- language: 'us',
- icons: {
- time: "icon-time",
- date: "icon-calendar",
- up: "icon-arrow-up",
- down: "icon-arrow-down"
- }
- });
- });
-</script>
-{{if $content}}
+{{if $content || $attachment || $expanded}}
<script>initEditor();</script>
{{/if}}
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index a3d42b0b4..2c79a496d 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -8,7 +8,7 @@
<div class="clear"></div>
</div>
{{if $editor}}
-<div id="webpage-editor" class="section-content-tools-wrapper form-group">
+<div id="webpage-editor" class="section-content-tools-wrapper">
{{$editor}}
</div>
{{/if}}