This commit is contained in:
yuri
2017-01-24 16:00:26 +02:00
parent bf660e81ae
commit c114e08541
3 changed files with 10 additions and 6 deletions
@@ -6,9 +6,8 @@
<div class="btn-group">
<button class="btn btn-default" data-action="today">{{translate 'Today' scope='Calendar'}}</button>
<button class="btn btn-default" title="{{translate 'Refresh'}}" data-action="refresh"><span class="glyphicon glyphicon-refresh"></span></button>
</div>
{{#if calendarTypeSelectEnabled}}
<div class="btn-group calendar-type-button-group" role="group">
</div>{{#if calendarTypeSelectEnabled}}<div class="btn-group calendar-type-button-group">
<div class="btn-group " role="group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="calendar-type-label">{{calendarTypeLabel}}</span> <span class="caret"></span></button>
<ul class="dropdown-menu">
{{#each calendarTypeDataList}}
@@ -19,9 +18,9 @@
</li>
{{/each}}
</ul>
<button class="btn btn-default{{#ifNotEqual calendarType 'shared'}} hidden{{/ifNotEqual}}" data-action="showSharedCalendarOptions">{{translate 'Manage Users' scope='Calendar'}}</button>
</div>
<button class="btn btn-default{{#ifNotEqual calendarType 'shared'}} hidden{{/ifNotEqual}}" data-action="showSharedCalendarOptions" title="{{translate 'Manage Users' scope='Calendar'}}"><span class="glyphicon glyphicon-pencil"></span></button>
</div>
{{/if}}
</div>
+4
View File
@@ -1226,6 +1226,10 @@ table.table td.cell .complex-text {
#main > .calendar-container {
margin-top: 10px;
.calendar-type-button-group {
margin-left: 6px;
}
}
#notifications-panel {
+2 -1
View File
@@ -79,7 +79,8 @@ table.table {
.list-container > .list,
.panel,
.dashlet-container,
#main > .calendar-container,
#main > .calendar-container .calendar,
#main > .calendar-container .timeline,
.well,
.admin-content .table.table-bordered,
.admin-content iframe {