diff options
| -rw-r--r-- | include/widgets.php | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 26 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/events_tools_side.tpl | 22 |
5 files changed, 34 insertions, 27 deletions
diff --git a/include/widgets.php b/include/widgets.php index b95cbfc26..c88c03f7e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1567,7 +1567,7 @@ function widget_tasklist($arr) { </script>'; $o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">'; - $o .= '</div><form id="tasklist-new-form" action="" ><input id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; + $o .= '</div><form id="tasklist-new-form" action="" ><input class="form-control" id="tasklist-new-summary" type="text" name="summary" value="" /></form>'; $o .= '</div>'; return $o; diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 2a91336c7..d07a06b67 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -32,11 +32,13 @@ {{/if}} <div class="form-group"> - <div id="event-desc-text"><b>{{$d_text}}</b></div> - <textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea> + <div class="form-group"> + <div id="event-desc-text"><b>{{$d_text}}</b></div> + <textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea> + </div> <div id="comment-tools-desc" class="comment-tools" style="display: block;" > <div id="comment-edit-bb-desc" class="btn-toolbar"> - <div class='btn-group'> + <div class='btn-group mr-2'> <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');"> <i class="fa fa-bold comment-icon"></i> </button> @@ -68,11 +70,13 @@ </div> </div> <div class="form-group"> - <div id="event-location-text"><b>{{$l_text}}</b></div> - <textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea> + <div class="form-group"> + <div id="event-location-text"><b>{{$l_text}}</b></div> + <textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea> + </div> <div id="comment-tools-loc" class="comment-tools" style="display: block;" > <div id="comment-edit-bb-loc" class="btn-toolbar"> - <div class='btn-group'> + <div class='btn-group mr-2'> <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');"> <i class="fa fa-bold comment-icon"></i> </button> @@ -111,13 +115,13 @@ <div class="clear"></div> - <button type="button" class="btn btn-outline-secondary" onclick="openClose('advanced');">{{$advanced}}</button> - <div class="btn-group pull-right"> - <button id="event-edit-preview-btn" class="btn btn-outline-secondary" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> + <button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button> + <div class="btn-group float-right"> + <button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-outline-secondary" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> {{/if}} - <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> + <button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button> </div> </form> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 1d1b6f15b..3b2cb5041 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -50,6 +50,7 @@ $('#events-calendar').fullCalendar({ events: '{{$baseurl}}{{$module_url}}/json', header: false, + eventTextColor: 'white', lang: '{{$lang}}', firstDay: {{$first_day}}, diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 936b10970..9d32c76be 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -3,11 +3,11 @@ <div class="pull-right"> <div class="dropdown"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> {{$view_label}}</button> - <ul class="dropdown-menu"> - <li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li> - <li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li> - <li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li> - </ul> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a> + <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a> + <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a> + </div> <button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button> <div class="btn-group"> <button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl index 5a4731863..bc6f09ae8 100755 --- a/view/tpl/events_tools_side.tpl +++ b/view/tpl/events_tools_side.tpl @@ -1,15 +1,17 @@ <div class="widget"> <h3>{{$title}}</h3> - <ul class="nav nav-pills nav-stacked"> - <li><a href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i> {{$export}}</a></li> - <li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i> {{$import}}</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i> {{$export}}</a></li> + <li class="nav-item"><a class="nav-link" href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i> {{$import}}</a></li> </ul> - <div id="event-upload-form" style="display: none;"> - <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> - <div class="form-group"> - <input id="event-upload-choose" type="file" name="userfile" /> - </div> - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> - </form> + <div id="event-upload-form" class="sub-menu-wrapper"> + <div class="sub-menu"> + <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> + <div class="form-group"> + <input id="event-upload-choose" class="form-control-file w100" type="file" name="userfile" /> + </div> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </form> + </div> </div> </div> |