harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bs4 fixes for events

Browse Source
This commit is contained in:
Mario Vavti 2017-03-23 13:11:27 +01:00
parent 4d50fe0928
commit 43a794a905
5 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/widgets.php
View File

@ -1567,7 +1567,7 @@ function widget_tasklist($arr) {
</script>'; </script>';
$o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">'; $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>'; $o .= '</div>';
return $o; return $o;

18
view/tpl/event_form.tpl
View File

@ -31,12 +31,14 @@
</div> </div>
{{/if}} {{/if}}
<div class="form-group">
<div class="form-group"> <div class="form-group">
<div id="event-desc-text"><b>{{$d_text}}</b></div> <div id="event-desc-text"><b>{{$d_text}}</b></div>
<textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea> <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-tools-desc" class="comment-tools" style="display: block;" >
<div id="comment-edit-bb-desc" class="btn-toolbar"> <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');"> <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> <i class="fa fa-bold comment-icon"></i>
</button> </button>
@ -67,12 +69,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<div class="form-group"> <div class="form-group">
<div id="event-location-text"><b>{{$l_text}}</b></div> <div id="event-location-text"><b>{{$l_text}}</b></div>
<textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea> <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-tools-loc" class="comment-tools" style="display: block;" >
<div id="comment-edit-bb-loc" class="btn-toolbar"> <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');"> <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> <i class="fa fa-bold comment-icon"></i>
</button> </button>
@ -111,13 +115,13 @@
<div class="clear"></div> <div class="clear"></div>
<button type="button" class="btn btn-outline-secondary" onclick="openClose('advanced');">{{$advanced}}</button> <button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button>
<div class="btn-group pull-right"> <div class="btn-group float-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 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}} {{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}} {{/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> </div>
</form> </form>

1
view/tpl/event_head.tpl
View File

@ -50,6 +50,7 @@
$('#events-calendar').fullCalendar({ $('#events-calendar').fullCalendar({
events: '{{$baseurl}}{{$module_url}}/json', events: '{{$baseurl}}{{$module_url}}/json',
header: false, header: false,
eventTextColor: 'white',
lang: '{{$lang}}', lang: '{{$lang}}',
firstDay: {{$first_day}}, firstDay: {{$first_day}},

10
view/tpl/events-js.tpl
View File

@ -3,11 +3,11 @@
<div class="pull-right"> <div class="pull-right">
<div class="dropdown"> <div class="dropdown">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button>
<ul class="dropdown-menu"> <div class="dropdown-menu">
<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li> <a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a>
<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li> <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a>
<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li> <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a>
</ul> </div>
<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button> <button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
<div class="btn-group"> <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> <button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>

12
view/tpl/events_tools_side.tpl
View File

@ -1,15 +1,17 @@
<div class="widget"> <div class="widget">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills flex-column">
<li><a href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li> <li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li>
<li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$import}}</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>&nbsp;{{$import}}</a></li>
</ul> </ul>
<div id="event-upload-form" style="display: none;"> <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"> <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
<div class="form-group"> <div class="form-group">
<input id="event-upload-choose" type="file" name="userfile" /> <input id="event-upload-choose" class="form-control-file w100" type="file" name="userfile" />
</div> </div>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
</form> </form>
</div> </div>
</div>
</div> </div>