diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/event_form.tpl | 92 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 16 |
3 files changed, 17 insertions, 93 deletions
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d91e44458..ade404125 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -3,8 +3,7 @@ <h3>{{$title}}</h3> <p> -{{if ! $bootstrap}} -{{$format_desc}} {{/if}}{{$desc}} +{{$desc}} </p> <form action="{{$post}}" method="post" > @@ -17,11 +16,7 @@ <input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> <div id="event-start-text">{{$s_text}}</div> -{{if $bootstrap}} -<i class="icon-calendar btn btn-default" onclick="eventGetStart(); return false;" /></i> <input type="text" name="start_text" id="start-text" value="{{$stext}}" /> -{{else}} -{{$s_dsel}} {{$s_tsel}} -{{/if}} +{{$s_dsel}} <div class="clear"></div><br /> @@ -31,11 +26,7 @@ <div id="event-finish-wrapper"> <div id="event-finish-text">{{$f_text}}</div> -{{if $bootstrap}} -<i class="icon-calendar btn btn-default" onclick="eventGetFinish(); return false;" /></i> <input type="text" name="finish_text" id="finish-text" value="{{$ftext}}" /> -{{else}} -{{$f_dsel}} {{$f_tsel}} -{{/if}} +{{$f_dsel}} </div> <div id="event-datetime-break"></div> @@ -73,81 +64,4 @@ <input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> </form> -<!-- Modal for item expiry--> -<div class="modal" id="startModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="startModalLabel">{{$s_text}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class="input-group input-group-sm date" id="datetimepickerstart"> - <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> - <span class="icon-calendar"></span> - </span> - <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/> - </div> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> - <button id="start-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> -</div><!-- /.modal --> -<script type="text/javascript"> - $(function() { - $('#datetimepickerstart').datetimepicker({ - language: 'us', - icons: { - time: "icon-time", - date: "icon-calendar", - up: "icon-arrow-up", - down: "icon-arrow-down" - } - }); - }); -</script> - -<!-- Modal for item expiry--> -<div class="modal" id="finishModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="finishModalLabel">{{$s_text}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class="input-group input-group-sm date" id="datetimepickerfinish"> - <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> - <span class="icon-calendar"></span> - </span> - <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/> - </div> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> - <button id="finish-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> -</div><!-- /.modal --> -<script type="text/javascript"> - $(function() { - $('#datetimepickerfinish').datetimepicker({ - language: 'us', - icons: { - time: "icon-time", - date: "icon-calendar", - up: "icon-arrow-up", - down: "icon-arrow-down" - } - }); - }); -</script> </div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if !$userinfo}} {{if $nav.loginmenu}} <li class="{{$nav.loginmenu.0.2}}"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a> @@ -92,7 +93,6 @@ </li> {{/if}} - {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if $nav.messages}} <li class="{{$sel.messages}} hidden-xs"> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 4a9c0dfe8..4961464dc 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -3,11 +3,21 @@ <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> -{{if $tools}} -<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> + +{{if $lock}} +<div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> +</div> {{/if}} -{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}} + + +{{if $tools}} +<div> + <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> </div> +{{/if}} + +<div class="clear"></div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} <div id="photo-view-wrapper"> |