Skip to content

Commit

Permalink
ER:Update documentation links.
Browse files Browse the repository at this point in the history
  • Loading branch information
bbalet committed Feb 15, 2015
1 parent 381f668 commit 1869ea7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions application/language/french/global_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
$lang['global_link_doc_page_leave_validation'] = '';
$lang['global_link_doc_page_login'] = 'http://fr.jorani.org/ecrans/page-ecran-de-connexion.html';
$lang['global_link_doc_page_create_user'] = 'http://fr.jorani.org/ecrans/page-ajouter-un-utilisateur.html';
$lang['global_link_doc_page_list_users'] = '';
$lang['global_link_doc_page_list_users'] = 'http://fr.jorani.org/ecrans/page-liste-des-utilisateurs.html';
$lang['global_link_doc_page_list_employees'] = 'http://fr.jorani.org/ecrans/page-liste-des-employes.html';

$lang['global_link_doc_page_presence_report'] = '';
$lang['global_link_doc_page_presence_report'] = 'http://fr.jorani.org/ecrans/page-rapport-presence-mensuelle.html';

$lang['global_link_doc_page_leave_balance_report'] = 'http://fr.jorani.org/ecrans/page-rapport-etat-des-conges.html';

Expand Down
12 changes: 6 additions & 6 deletions application/views/users/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,12 @@
<td><?php echo $users_item['manager'] ?></td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</div>
</tbody>
</table>
</div>
</div>

<div class="row-fluid">
<div class="span12">&nbsp;</div>
</div>
<div class="row-fluid"><div class="span12">&nbsp;</div></div>

<div class="row-fluid">
<div class="span3">
Expand All @@ -98,6 +96,8 @@
</div>
</div>

<div class="row-fluid"><div class="span12">&nbsp;</div></div>

<link href="<?php echo base_url();?>assets/datatable/css/jquery.dataTables.css" rel="stylesheet">
<script type="text/javascript" src="<?php echo base_url();?>assets/datatable/js/jquery.dataTables.min.js"></script>

Expand Down
1 change: 0 additions & 1 deletion docs/install/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Jorani has been tested with MySQL and MariaDB (please note that functions are cr
* Change <code>application/config/config.php</code> according to your environment.

Please note that the schema contains procedures, so the user created must have EXECUTE permission.
You might need to change the code <code>CREATE DEFINER=`root`@`localhost`</code> of the <code>/sql/lms.sql</code> file if the db user you are using to create the schema is not the root user (e.g. on shared hosting).

## E-mail setup

Expand Down
2 changes: 1 addition & 1 deletion requirements.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function export2csv() {

<h1>Jorani Requirements</h1>

<button class="btn btn-primary" onclick="export2csv();"><i class="icon-hdd icon-white"></i>&nbsp;Export to a CSV file</button>
<button class="btn btn-primary" onclick="export2csv();"><i class="icon-download-alt icon-white"></i>&nbsp;Export to a CSV file</button>

<h2>Web Server</h2>

Expand Down

0 comments on commit 1869ea7

Please sign in to comment.