mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-25 09:23:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'thijslemmens-master' into develop

Browse source
This commit is contained in:
Alex Tselegidis 2016-03-07 20:59:27 +01:00
commit 29effc24bf
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/application/language/dutch/translations_lang.php
View file

@ -218,7 +218,7 @@ $lang['no_privileges'] ='Geen rechten';
$lang['no_provileges_message'] ='Je hebt niet de benodigde rechten om deze pagina te bekijken. Navigeer naar een andere sectie.';
$lang['backend_calendar'] ='Backend Kalender';
$lang['start_date_time'] ='Start Datum / Tijd';
$lang['end_date_time'] ='End Date / Time';
$lang['end_date_time'] ='Eind Datum / Tijd';
$lang['licensed_under'] ='Gelicenseerd onder';
$lang['unexpected_issues_occurred'] ='Onverwachte problemen opgetreden!';
$lang['service_communication_error'] ='Een server communicatiefout opgetreden, probeer het opnieuw.';

12
src/application/views/backend/header.php Normal file → Executable file
View file

@ -81,7 +81,7 @@
// ------------------------------------------------------ ?>
<?php $hidden = ($privileges[PRIV_APPOINTMENTS]['view'] == TRUE) ? '' : 'hidden'; ?>
<?php $active = ($active_menu == PRIV_APPOINTMENTS) ? 'active' : ''; ?>
<a href="<?php echo $base_url; ?>/index.php/backend" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
<a href="<?php echo site_url('backend'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
title="<?php echo $this->lang->line('manage_appointment_record_hint'); ?>">
<?php echo $this->lang->line('calendar'); ?>
</a>
@ -90,7 +90,7 @@
// ------------------------------------------------------ ?>
<?php $hidden = ($privileges[PRIV_CUSTOMERS]['view'] == TRUE) ? '' : 'hidden'; ?>
<?php $active = ($active_menu == PRIV_CUSTOMERS) ? 'active' : ''; ?>
<a href="<?php echo $base_url; ?>/index.php/backend/customers" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
<a href="<?php echo site_url('backend/customers'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
title="<?php echo $this->lang->line('manage_customers_hint'); ?>">
<?php echo $this->lang->line('customers'); ?>
</a>
@ -99,7 +99,7 @@
// ------------------------------------------------------ ?>
<?php $hidden = ($privileges[PRIV_SERVICES]['view'] == TRUE) ? '' : 'hidden'; ?>
<?php $active = ($active_menu == PRIV_SERVICES) ? 'active' : ''; ?>
<a href="<?php echo $base_url; ?>/index.php/backend/services" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
<a href="<?php echo site_url('backend/services'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
title="<?php echo $this->lang->line('manage_services_hint'); ?>">
<?php echo $this->lang->line('services'); ?>
</a>
@ -108,7 +108,7 @@
// ------------------------------------------------------ ?>
<?php $hidden = ($privileges[PRIV_USERS]['view'] == TRUE) ? '' : 'hidden'; ?>
<?php $active = ($active_menu == PRIV_USERS) ? 'active' : ''; ?>
<a href="<?php echo $base_url; ?>/index.php/backend/users" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
<a href="<?php echo site_url('backend/users'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
title="<?php echo $this->lang->line('manage_users_hint'); ?>">
<?php echo $this->lang->line('users'); ?>
</a>
@ -118,14 +118,14 @@
<?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE
|| $privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
<?php $active = ($active_menu == PRIV_SYSTEM_SETTINGS) ? 'active' : ''; ?>
<a href="<?php echo $base_url; ?>/index.php/backend/settings" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
<a href="<?php echo site_url('backend/settings'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
title="<?php echo $this->lang->line('settings_hint'); ?>">
<?php echo $this->lang->line('settings'); ?>
</a>
<?php // LOGOUT MENU ITEM
// ------------------------------------------------------ ?>
<a href="<?php echo $base_url; ?>/index.php/user/logout" class="menu-item"
<a href="<?php echo site_url('user/logout') ?>" class="menu-item"
title="<?php echo $this->lang->line('log_out_hint'); ?>">
<?php echo $this->lang->line('log_out'); ?>
</a>

2
src/application/views/general/installation.php Normal file → Executable file
View file

@ -72,7 +72,7 @@
<p>
This page will help you set the main settings of your Easy!Appointments installation.
You will be able to edit these settings and many more in the backend session of your
system. Remember to use the <strong class="text-primary"><?php echo $base_url; ?>/index.php/backend</strong>
system. Remember to use the <strong class="text-primary"><?php echo site_url('backend'); ?>/strong>
url to connect to the backend section of Easy!Appointments.
If you face any problems during the usage of Easy!Appointments you can always check