aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/events-js.tpl2
-rwxr-xr-xview/tpl/field_input.tpl2
-rwxr-xr-xview/tpl/jot.tpl18
-rwxr-xr-xview/tpl/photos_upload.tpl2
-rwxr-xr-xview/tpl/profile_advanced.tpl2
-rwxr-xr-xview/tpl/profile_vcard.tpl2
6 files changed, 15 insertions, 13 deletions
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 08c8aa64a..c29d80347 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,7 +1,7 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
+ <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
<div class="btn-group">
<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index 128bbfbe1..d6a7f56b2 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,4 +1,4 @@
- <div class='form-group field input'>
+ <div id="id_{{$field.0}}_wrapper" class='form-group field input'>
<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
<input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>
<span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 32a08a9b3..631f55d83 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,3 +1,10 @@
+{{$mimeselect}}
+{{$layoutselect}}
+{{if $id_select}}
+<div class="channel-id-select-div">
+ <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+</div>
+{{/if}}
<div id="profile-jot-wrapper">
<form id="profile-jot-form" action="{{$action}}" method="post">
{{if $parent}}
@@ -17,13 +24,7 @@
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
{{if $showacl}}{{$acl}}{{/if}}
- {{$mimeselect}}
- {{$layoutselect}}
- {{if $id_select}}
- <div class="channel-id-select-div">
- <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
- </div>
- {{/if}}
+
{{if $webpage}}
<div id="jot-pagetitle-wrap" class="jothidden">
<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
@@ -159,10 +160,11 @@
</div>
<div id="profile-jot-text-loading"></div>
<div id="profile-jot-end" class="clear"></div>
- <div id="jot-preview-content" style="display:none;"></div>
</form>
</div>
+<div id="jot-preview-content" style="display:none;"></div>
+
<!-- Modal for item expiry-->
<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
<div class="modal-dialog">
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 11a08204d..5bcef5dc1 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -26,7 +26,7 @@
<div id="body-textarea">
{{include file="field_textarea.tpl" field=$body}}
</div>
- <div class="pull-right btn-group form-group">
+ <div class="pull-right btn-group">
<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;">
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 3d09b762d..0f968a53f 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -23,7 +23,7 @@
<li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li>
{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
</ul>
- {{else}}
+ {{elseif $editmenu}}
<a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="icon-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
{{/if}}
</div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 3c3bfda5a..943cc6339 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -19,7 +19,7 @@
{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
</ul>
</div>
- {{else}}
+ {{elseif $editmenu}}
<a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a>
{{/if}}
{{/if}}