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

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source 
Conflicts:
	version.inc
This commit is contained in:
redmatrix 2015-11-19 11:47:41 -08:00
commit b5875c3af9
6 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/widgets.php
View File

@ -671,7 +671,6 @@ function widget_eventsmenu($arr) {
'$day' => t('Day View'), '$day' => t('Day View'),
'$week' => t('Week View'), '$week' => t('Week View'),
'$month' => t('Month View'), '$month' => t('Month View'),
'$today' => t('Today'),
'$export' => t('Export'), '$export' => t('Export'),
'$upload' => t('Import'), '$upload' => t('Import'),
'$submit' => t('Submit') '$submit' => t('Submit')

1
mod/events.php
View File

@ -531,6 +531,7 @@ function events_content(&$a) {
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$prev' => t('Previous'), '$prev' => t('Previous'),
'$next' => t('Next'), '$next' => t('Next'),
'$today' => t('Today')
)); ));
if (x($_GET,'id')){ echo $o; killme(); } if (x($_GET,'id')){ echo $o; killme(); }

6
view/css/mod_events.css
View File

@ -1,3 +1,9 @@
/* fix borders */
#events-calendar {
margin-left: -1px;
margin-bottom: -1px;
}
#event-desc-textarea, #event-location-textarea { #event-desc-textarea, #event-location-textarea {
width: 400px; width: 400px;
} }

10
view/theme/redbasic/css/style.css
View File

@ -847,6 +847,16 @@ nav .acpopup {
cursor: pointer; cursor: pointer;
} }
.fc-unthemed th,
.fc-unthemed td,
.fc-unthemed thead,
.fc-unthemed tbody,
.fc-unthemed .fc-divider,
.fc-unthemed .fc-row,
.fc-unthemed .fc-popover {
border-color: #ccc !important;
}
.eventcal { .eventcal {
float: left; float: left;
font-size: 20px; font-size: 20px;

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

@ -6,6 +6,7 @@
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
<button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button> <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
</div> </div>
</div> </div>

1
view/tpl/events_side.tpl
View File

@ -4,6 +4,5 @@
<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li> <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', 'agendaWeek'); return false;">{{$week}}</a></li>
<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li> <li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
<li><a href="#" onclick="changeView('today', false); return false;">{{$today}}</a></li>
</ul> </ul>
</div> </div>