iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

css and layout fixes. font path fix

This commit is contained in:
Felix Favre 2014-12-06 19:02:02 +01:00
parent 191ba6e1b1
commit 3973236f6e
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/view/User_view.php
View File

@ -28,7 +28,7 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
$user['Tshirt'] = glyph_bool($user['Tshirt']); $user['Tshirt'] = glyph_bool($user['Tshirt']);
$user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']); $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']);
$user['actions'] = table_buttons(array( $user['actions'] = table_buttons(array(
button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-sm') button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-sm')
)); ));
} }
$users[] = array( $users[] = array(
@ -180,12 +180,16 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
User_groups_render($user_groups) User_groups_render($user_groups)
)) ))
)), )),
buttons(array( div('row space-top', array(
$admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit")) : '', div('col-md-12', array(
! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '', buttons(array(
$its_me ? button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '', $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], glyph("edit") . _("edit")) : '',
$its_me ? button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '', ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
$its_me ? button(page_link_to_absolute('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : '' $its_me ? button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '',
$its_me ? button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '',
$its_me ? button(page_link_to_absolute('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : ''
))
))
)), )),
($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '', ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
($its_me || $admin_user_privilege) ? table(array( ($its_me || $admin_user_privilege) ? table(array(

3
public/css/theme0.css
View File

@ -6316,3 +6316,6 @@ td.occupied {
atd.occupied:hover { atd.occupied:hover {
background-color: #c1e2b3; background-color: #c1e2b3;
} }
.space-top {
margin-top: 15px;
}

3
public/css/theme1.css
View File

@ -6339,6 +6339,9 @@ td.occupied {
atd.occupied:hover { atd.occupied:hover {
background-color: #449d44; background-color: #449d44;
} }
.space-top {
margin-top: 15px;
}
.text-primary, .text-primary,
.text-primary:hover { .text-primary:hover {
color: #428bca; color: #428bca;

8
themes/base.less
View File

@ -1,5 +1,7 @@
@import "../vendor/bootstrap/less/bootstrap"; @import "../vendor/bootstrap/less/bootstrap";
@icon-font-path: "../vendor/bootstrap/fonts/";
body { body {
padding-top: 50px; padding-top: 50px;
} }
@ -14,4 +16,8 @@ td.free {
td.occupied { td.occupied {
.bg-success(); .bg-success();
} }
.space-top {
margin-top: 15px;
}