diff options
| author | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
|---|---|---|
| committer | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
| commit | e523061b7261439a71bdacf8f46d4c614740b356 (patch) | |
| tree | 1a0577c64197c4289ed154d2c2d5fdf48a7e5192 /view/tpl/jot.tpl | |
| parent | 13fd91d6f5723774a1b96257f8096acb2873b4ed (diff) | |
| parent | b71b45aafc618d32d23c099a4d4db8bad2f09e54 (diff) | |
| download | volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.gz volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.bz2 volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.zip | |
Merge pull request #1 from friendica/master
Merge master from friendica
Diffstat (limited to 'view/tpl/jot.tpl')
| -rwxr-xr-x | view/tpl/jot.tpl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 12da18ef1..f172a6dfa 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -76,7 +76,7 @@ </div> <div id="profile-jot-submit-right" class="btn-group pull-right"> {{if $showacl}} - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> </button> {{/if}} @@ -85,7 +85,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit" >{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> @@ -108,12 +108,7 @@ </div> <!-- <div class="modal-body"> --> <div class="modal-body form-group" style="width:90%"> - <div class="input-group input-group-sm date" id="datetimepicker1"> - <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> - <span class="icon-calendar"></span> - </span> - <input id="expiration-date" type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/> - </div> + <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='start_text' id='expiration-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> </div> <!-- </div> --> <div class="modal-footer"> |