maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Fixed problem with missing EALang variable in JavaScript

Browse source
This commit is contained in:
Alex Tselegidis 2015-04-29 23:17:32 +02:00
parent 57d6cc4a52
commit 1a783ec3ce
2 changed files with 64 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/application/views/appointments/message.php
View file

@ -7,23 +7,6 @@
<meta name="theme-color" content="#35A768"> <meta name="theme-color" content="#35A768">
<title><?php echo $message_title ?></title> <title><?php echo $message_title ?></title>
<?php
// ------------------------------------------------------------
// INCLUDE JS FILES
// ------------------------------------------------------------ ?>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/libs/jquery/jquery.min.js"></script>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/libs/date.js"></script>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/general_functions.js"></script>
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
// INCLUDE CSS FILES // INCLUDE CSS FILES
@ -42,6 +25,31 @@
<link rel="icon" sizes="192x192" <link rel="icon" sizes="192x192"
href="<?php echo $this->config->base_url(); ?>/assets/img/logo.png"> href="<?php echo $this->config->base_url(); ?>/assets/img/logo.png">
<?php
// ------------------------------------------------------------
// CUSTOM PAGE JS
// ------------------------------------------------------------ ?>
<script type="text/javascript">
var EALang = <?php echo json_encode($this->lang->language); ?>;
</script>
<?php
// ------------------------------------------------------------
// INCLUDE JS FILES
// ------------------------------------------------------------ ?>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/libs/jquery/jquery.min.js"></script>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/libs/date.js"></script>
<script
type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/general_functions.js"></script>
</head> </head>
<body> <body>

55
src/application/views/general/error404.php
View file

@ -4,7 +4,40 @@
<title><?php echo $this->lang->line('page_not_found') . ' - ' . $company_name; ?></title> <title><?php echo $this->lang->line('page_not_found') . ' - ' . $company_name; ?></title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<?php // INCLUDE JS FILES ?> <?php
// ------------------------------------------------------------
// INCLUDE CSS FILES
// ------------------------------------------------------------ ?>
<link
rel="stylesheet"
type="text/css"
href="<?php echo $this->config->base_url(); ?>/assets/css/libs/bootstrap/bootstrap.css">
<link
rel="stylesheet"
type="text/css"
href="<?php echo $this->config->base_url(); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
<?php
// ------------------------------------------------------------
// SET PAGE FAVICON
// ------------------------------------------------------------ ?>
<link
rel="icon"
type="image/x-icon"
href="<?php echo $this->config->base_url(); ?>/assets/img/favicon.ico">
<?php
// ------------------------------------------------------------
// CUSTOM PAGE JS
// ------------------------------------------------------------ ?>
<script type="text/javascript">
var EALang = <?php echo json_encode($this->lang->language); ?>;
</script>
<?php
// ------------------------------------------------------------
// INCLUDE JS FILES
// ------------------------------------------------------------ ?>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/libs/jquery/jquery.min.js"></script> src="<?php echo $this->config->base_url(); ?>/assets/js/libs/jquery/jquery.min.js"></script>
@ -18,22 +51,10 @@
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->base_url(); ?>/assets/js/general_functions.js"></script> src="<?php echo $this->config->base_url(); ?>/assets/js/general_functions.js"></script>
<?php // INCLUDE CSS FILES ?> <?php
<link // ------------------------------------------------------------
rel="stylesheet" // CUSTOM PAGE CSS
type="text/css" // ------------------------------------------------------------ ?>
href="<?php echo $this->config->base_url(); ?>/assets/css/libs/bootstrap/bootstrap.css">
<link
rel="stylesheet"
type="text/css"
href="<?php echo $this->config->base_url(); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
<?php // SET FAVICON FOR PAGE ?>
<link
rel="icon"
type="image/x-icon"
href="<?php echo $this->config->base_url(); ?>/assets/img/favicon.ico">
<style> <style>
body { body {
background-color: #CAEDF3; background-color: #CAEDF3;