More missing changes

torontomulibrary · Nov 18, 2021 · 5a2652f · 5a2652f
1 parent 843d680
commit 5a2652f
Show file tree

Hide file tree

Showing 85 changed files with 18,748 additions and 2,599 deletions.
diff --git a/.htaccess b/.htaccess
@@ -1,7 +1,7 @@
 <IfModule mod_rewrite.c>
-#	RewriteEngine On
-#	RewriteCond %{HTTPS} !=on
-#	RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+	RewriteEngine On
+	RewriteCond %{HTTPS} !=on
+	RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
 
 	RewriteEngine On

diff --git a/alter_tables.sql b/alter_tables.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `room_booking`.`rooms` 
+ADD COLUMN `minimum_slot` INT(11) NULL DEFAULT 30 COMMENT '' AFTER `requires_moderation`;
diff --git a/application/config/autoload.php b/application/config/autoload.php
@@ -109,7 +109,7 @@
 |
 */
 
-$autoload['model'] = array();
+$autoload['model'] = array('settings_model');
 
 
 /* End of file autoload.php */

diff --git a/application/config/constants.php.sample b/application/config/constants.php.sample
@@ -38,14 +38,11 @@ define('FOPEN_READ_WRITE_CREATE_STRICT',					'x+b');
 
 define('USER_AGENT',										'LibraryBooking/1.0');
 
-define('SITE_TITLE',										'Name goes here');
-define('SITE_LOGO',											'https://domain.com/assets/images/logo.png');
 
 //Defaults if user has no roles
 define('DEFAULT_TEMPLATE',									'rula_template');
 define('DEFAULT_POLICY_URL',								'https://domain.com/room-booking-policy/');
 
-define('DEBUG_MODE',										FALSE);
 define('SITE_ADMIN',										'[email protected]');
 define('REPLY_EMAIL',										'[email protected]'); //Used as the "FROM" address when sending emails
 define('CONTACT_EMAIL',										'[email protected]');
@@ -80,6 +77,7 @@ define('TIME_DELAY',										0); //No delay
 define('SEND_MODERATION_ACTION_EMAIL',						TRUE);
 define('SEND_MODERATION_REQUEST_CONFIRMATION_EMAIL',		TRUE);
 
+define('IMAGE_DIR', 'uploads');
 
 /* End of file constants.php */
 /* Location: ./application/config/constants.php */
diff --git a/assets/template/fcs/css/mobile.css b/assets/template/fcs/css/mobile.css
@@ -0,0 +1,84 @@
+.detail_label{
+	display: inline-block;
+	min-width: 160px;
+	width: 200px;
+
+	padding: 0.4em 0;
+	font-weight: bold;
+	float: left;
+}
+
+.detail{
+	float: left;
+}
+
+.footer {
+    color: #333333;
+    font-family: Arial,Verdana,Geneva,sans-serif;
+    font-size: 9pt;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.alert-danger .ui-bar{
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1;
+}
+
+.alert-danger .ui-body{
+	background-color: #FFF8F8;
+}
+
+.alert-warning .ui-bar{
+	  background-color: #fcf8e3;
+    border-color: #faebcc;
+    color: #8a6d3b;
+}
+
+.alert-warning .ui-body{
+	background-color: #FFFFFD;
+}
+
+.alert-success .ui-bar{
+	    background-color: #dff0d8;
+    border-color: #d6e9c6;
+    color: #3c763d;
+}
+
+.alert-success .ui-body{
+	background-color: #F9FFF2;
+}
+
+.custom-corners .ui-bar {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 7px;
+}
+
+.select_label{
+	line-height: 3em;
+}
+
+.text_area_height{
+	height: auto !important;
+}
+
+
+@media only screen and (max-width: 500px) {
+    .detail{
+		display: block;
+		float: none;
+		padding-bottom: 0.6em;
+	}
+
+	.detail_label{
+		display: block;
+		float: none;
+		width: auto;
+		min-width: 0;
+	}
+
+	.select_label{
+	line-height: normal;
+}
+}
diff --git a/assets/template/fcs_2019/css/mobile.css b/assets/template/fcs_2019/css/mobile.css
@@ -0,0 +1,84 @@
+.detail_label{
+	display: inline-block;
+	min-width: 160px;
+	width: 200px;
+
+	padding: 0.4em 0;
+	font-weight: bold;
+	float: left;
+}
+
+.detail{
+	float: left;
+}
+
+.footer {
+    color: #333333;
+    font-family: Arial,Verdana,Geneva,sans-serif;
+    font-size: 9pt;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.alert-danger .ui-bar{
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1;
+}
+
+.alert-danger .ui-body{
+	background-color: #FFF8F8;
+}
+
+.alert-warning .ui-bar{
+	  background-color: #fcf8e3;
+    border-color: #faebcc;
+    color: #8a6d3b;
+}
+
+.alert-warning .ui-body{
+	background-color: #FFFFFD;
+}
+
+.alert-success .ui-bar{
+	    background-color: #dff0d8;
+    border-color: #d6e9c6;
+    color: #3c763d;
+}
+
+.alert-success .ui-body{
+	background-color: #F9FFF2;
+}
+
+.custom-corners .ui-bar {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 7px;
+}
+
+.select_label{
+	line-height: 3em;
+}
+
+.text_area_height{
+	height: auto !important;
+}
+
+
+@media only screen and (max-width: 500px) {
+    .detail{
+		display: block;
+		float: none;
+		padding-bottom: 0.6em;
+	}
+
+	.detail_label{
+		display: block;
+		float: none;
+		width: auto;
+		min-width: 0;
+	}
+
+	.select_label{
+	line-height: normal;
+}
+}
diff --git a/assets/template/rula/css/mobile.css b/assets/template/rula/css/mobile.css
@@ -0,0 +1,84 @@
+.detail_label{
+	display: inline-block;
+	min-width: 160px;
+	width: 200px;
+
+	padding: 0.4em 0;
+	font-weight: bold;
+	float: left;
+}
+
+.detail{
+	float: left;
+}
+
+.footer {
+    color: #333333;
+    font-family: Arial,Verdana,Geneva,sans-serif;
+    font-size: 9pt;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.alert-danger .ui-bar{
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1;
+}
+
+.alert-danger .ui-body{
+	background-color: #FFF8F8;
+}
+
+.alert-warning .ui-bar{
+	  background-color: #fcf8e3;
+    border-color: #faebcc;
+    color: #8a6d3b;
+}
+
+.alert-warning .ui-body{
+	background-color: #FFFFFD;
+}
+
+.alert-success .ui-bar{
+	    background-color: #dff0d8;
+    border-color: #d6e9c6;
+    color: #3c763d;
+}
+
+.alert-success .ui-body{
+	background-color: #F9FFF2;
+}
+
+.custom-corners .ui-bar {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 7px;
+}
+
+.select_label{
+	line-height: 3em;
+}
+
+.text_area_height{
+	height: auto !important;
+}
+
+
+@media only screen and (max-width: 500px) {
+    .detail{
+		display: block;
+		float: none;
+		padding-bottom: 0.6em;
+	}
+
+	.detail_label{
+		display: block;
+		float: none;
+		width: auto;
+		min-width: 0;
+	}
+
+	.select_label{
+	line-height: normal;
+}
+}
diff --git a/assets/template/rula2018/css/mobile.css b/assets/template/rula2018/css/mobile.css
@@ -0,0 +1,84 @@
+.detail_label{
+	display: inline-block;
+	min-width: 160px;
+	width: 200px;
+
+	padding: 0.4em 0;
+	font-weight: bold;
+	float: left;
+}
+
+.detail{
+	float: left;
+}
+
+.footer {
+    color: #333333;
+    font-family: Arial,Verdana,Geneva,sans-serif;
+    font-size: 9pt;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.alert-danger .ui-bar{
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1;
+}
+
+.alert-danger .ui-body{
+	background-color: #FFF8F8;
+}
+
+.alert-warning .ui-bar{
+	  background-color: #fcf8e3;
+    border-color: #faebcc;
+    color: #8a6d3b;
+}
+
+.alert-warning .ui-body{
+	background-color: #FFFFFD;
+}
+
+.alert-success .ui-bar{
+	    background-color: #dff0d8;
+    border-color: #d6e9c6;
+    color: #3c763d;
+}
+
+.alert-success .ui-body{
+	background-color: #F9FFF2;
+}
+
+.custom-corners .ui-bar {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 7px;
+}
+
+.select_label{
+	line-height: 3em;
+}
+
+.text_area_height{
+	height: auto !important;
+}
+
+
+@media only screen and (max-width: 500px) {
+    .detail{
+		display: block;
+		float: none;
+		padding-bottom: 0.6em;
+	}
+
+	.detail_label{
+		display: block;
+		float: none;
+		width: auto;
+		min-width: 0;
+	}
+
+	.select_label{
+	line-height: normal;
+}
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE `room_booking`.`rooms`
		ADD COLUMN `minimum_slot` INT(11) NULL DEFAULT 30 COMMENT '' AFTER `requires_moderation`;
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,7 @@ @@
     |
     */
-    $autoload['model'] = array();
+    $autoload['model'] = array('settings_model');
     /* End of file autoload.php */
@@ Expand Down @@