Skip to content

T
TimeOutAdmin
Commit 5fb74265 by Tobin
Options

DC

parent b0a45db3
Showing with 52 additions and 31 deletions
application/models/Api_model.php
...@@ -27,7 +27,7 @@ class Api_model extends CI_Model { ...@@ -27,7 +27,7 @@ class Api_model extends CI_Model {
} }
} else { } else {
$res = array('status'=>0,'message'=>'Invalid username / Password','code'=>'ER05'); $res = array('status'=>0,'message'=>'Wrong password. Try again or click Forgot password to reset it','code'=>'ER05');
} }
} catch(Exception $e) { } catch(Exception $e) {
$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06'); $res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
......
application/views/Event/eventAddForm.php
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group date" data-provide="datepicker"> <div date="start" class="input-group date" data-provide="datepicker">
<input id="date" type="text" class="form-control required" required <input id="date" type="text" class="form-control required" required
data-parsley-trigger="change" data-parsley-minlength="5" data-parsley-trigger="change" data-parsley-minlength="5"
name="event_start_date" placeholder="Event Start Date" autocomplete="off"> name="event_start_date" placeholder="Event Start Date" autocomplete="off">
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
</div> </div>
</div> </div>
<div class="input-group date padTop10 hide" data-provide="datepicker" <div date="end" class="input-group date padTop10 hide" data-provide="datepicker"
id="eventEndDate"> id="eventEndDate">
<input id="date" type="text" class="form-control" disabled <input id="date" type="text" class="form-control" disabled
data-parsley-trigger="change" data-parsley-minlength="5" data-parsley-trigger="change" data-parsley-minlength="5"
......
application/views/Templates/footer-script.php
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
<script> <script>
jQuery('.clockpicker').clockpicker(); jQuery('.clockpicker').clockpicker();
jQuery( document ).ready(function() { jQuery( document ).ready(function() {
if(jQuery('#rich_editor').length==1){ CKEDITOR.replace('rich_editor'); } if(jQuery('#rich_editor').length==1){CKEDITOR.replace('rich_editor');}
if(jQuery('#rich_editor_1').length==1){CKEDITOR.replace('rich_editor_1'); } if(jQuery('#rich_editor_1').length==1){CKEDITOR.replace('rich_editor_1');}
if(jQuery('#rich_editor_2').length==1){CKEDITOR.replace('rich_editor_2'); } if(jQuery('#rich_editor_2').length==1){CKEDITOR.replace('rich_editor_2');}
if(jQuery('#rich_editor_6').length==1){CKEDITOR.replace('rich_editor_6'); } if(jQuery('#rich_editor_6').length==1){CKEDITOR.replace('rich_editor_6');}
if(jQuery('#rich_editor_8').length==1){CKEDITOR.replace('rich_editor_8'); } if(jQuery('#rich_editor_8').length==1){CKEDITOR.replace('rich_editor_8');}
if(jQuery('#rich_editor_3').length==1){CKEDITOR.replace('rich_editor_3',{language:'ar'});} if(jQuery('#rich_editor_3').length==1){CKEDITOR.replace('rich_editor_3',{language:'ar'});}
if(jQuery('#rich_editor_4').length==1){CKEDITOR.replace('rich_editor_4',{language:'ar'});} if(jQuery('#rich_editor_4').length==1){CKEDITOR.replace('rich_editor_4',{language:'ar'});}
...@@ -49,26 +49,31 @@ ...@@ -49,26 +49,31 @@
$actionName = $ci->uri->segment(2); $actionName = $ci->uri->segment(2);
$page = $controllerName . '-' . $actionName; $page = $controllerName . '-' . $actionName;
// switch ($page) { switch ($page) {
//case 'Ride-view_rides': ?> case 'Event-addEvent': ?>
// jQuery(function () { jQuery(function () {
// jQuery('.datatable').DataTable({ jQuery('[date="start"]').datepicker({
// scrollY: "300px", format: 'dd - MM - yyyy',
// scrollX: true, startDate: '-0d',
// scrollCollapse: true, endDate: '+90d'
// paging: false, });
// fixedColumns: { jQuery('[date="end"]').datepicker({
// heightMatch: 'none' format: 'dd - MM - yyyy',
// } startDate: '+1d',
// }); endDate: '+90d'
// }); });
<?php //break; });
//default : ?> jQuery('.datatable').DataTable({
"ordering" : jQuery(this).data("ordering"),
"order": [[ 0, "desc" ]]
});
<?php break;
default : ?>
jQuery(function () { jQuery(function () {
jQuery('.datatable').DataTable({ jQuery('.datatable').DataTable({
"ordering" : jQuery(this).data("ordering"), "ordering" : jQuery(this).data("ordering"),
"order": [[ 0, "asc" ]] "order": [[ 0, "desc" ]]
}); });
}); });
<?php //} ?> <?php } ?>
</script> </script>
\ No newline at end of file
application/views/User/editProfile.php
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
<?php <?php
$user_type = $this->session->userdata('user_type'); $user_type = $this->session->userdata('user_type');
if($user_type == 2 || $user_type == 3){ ?> if(($user_type == 2 && !empty($provider)) || ($user_type == 3 && !empty($customer))){ ?>
<!-- Mechanic Data --> <!-- Mechanic Data -->
<div class="col-md-12"> <div class="col-md-12">
<div class="box-header with-border padUnset"> <div class="box-header with-border padUnset">
......
application/views/Venue/venueAddForm.php
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<option selected disabled>Choose a Region</option> <option selected disabled>Choose a Region</option>
<?php <?php
foreach ($regionData as $region) { foreach ($regionData as $region) {
$select = (isset($venue_data->region_id) && $venue_data->region_id == $region->id)?'selected':''; $select = (isset($venue_data->region_id) && $venue_data->region_id==$region->id)?'selected':'';
echo '<option '.$select.' value="'.$region->id.'">'. echo '<option '.$select.' value="'.$region->id.'">'.
$region->name. $region->name.
'</option>'; '</option>';
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>Venue Address</label> <label>Venue Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change" required
id="loc_search_1" name="location" placeholder="Venue Address" value="<?= (isset($venue_data->location))?$venue_data->location:'' ?>" required> name="location" placeholder="Venue Address" value="<?= (isset($venue_data->location))?$venue_data->location:'' ?>">
</div> </div>
<input type="hidden" id="gooLocLat" value="<?= (isset($venue_data->location_lat) && !empty($venue_data->location_lat))?$venue_data->location_lat:'' ?>" /> <input type="hidden" id="gooLocLat" value="<?= (isset($venue_data->location_lat) && !empty($venue_data->location_lat))?$venue_data->location_lat:'' ?>" />
......
assets/css/custom-style.css
...@@ -313,6 +313,18 @@ ...@@ -313,6 +313,18 @@
opacity: 0.5; opacity: 0.5;
} }
.padTop10 {
padding-top:10px !important;
}
.padTop15 {
padding-top:15px !important;
}
.padTop12 {
padding-top:12px !important;
}
/* .padBottom10 { /* .padBottom10 {
padding-bottom:10px !important; padding-bottom:10px !important;
} }
......
assets/js/custom-script.js
...@@ -78,12 +78,14 @@ function initLocSearch_1() { ...@@ -78,12 +78,14 @@ function initLocSearch_1() {
var options = {componentRestrictions: {country: country_flag}}; var options = {componentRestrictions: {country: country_flag}};
var autocomplete = new google.maps.places.Autocomplete(input, options); var autocomplete = new google.maps.places.Autocomplete(input, options);
} }
google.maps.event.addDomListener(window,'load',initLocSearch_1); google.maps.event.addDomListener(window,'load',initLocSearch_1);
function initLocSearch_2() { function initLocSearch_2() {
var input = document.getElementById('loc_search_2'); var input = document.getElementById('loc_search_2');
var options = {componentRestrictions: {country: country_flag}}; var options = {componentRestrictions: {country: country_flag}};
var autocomplete = new google.maps.places.Autocomplete(input, options); var autocomplete = new google.maps.places.Autocomplete(input, options);
} }
google.maps.event.addDomListener(window,'load',initLocSearch_2); google.maps.event.addDomListener(window,'load',initLocSearch_2);
function initLocSearch_3() { function initLocSearch_3() {
var input = document.getElementById('loc_search_3'); var input = document.getElementById('loc_search_3');
...@@ -829,7 +831,7 @@ jQuery('#locPointerMap').locationpicker({ ...@@ -829,7 +831,7 @@ jQuery('#locPointerMap').locationpicker({
zoomInput: parseInt(jQuery('#gooLocZoom').val()), zoomInput: parseInt(jQuery('#gooLocZoom').val()),
latitudeInput: jQuery('#gooLocLat'), latitudeInput: jQuery('#gooLocLat'),
longitudeInput: jQuery('#gooLocLng'), longitudeInput: jQuery('#gooLocLng'),
locationNameInput: jQuery('#loc_search_1') locationNameInput: jQuery('[name="location"]')
}, },
enableAutocomplete: true, enableAutocomplete: true,
onchanged: function(currentLocation, radius, isMarkerDropped) { onchanged: function(currentLocation, radius, isMarkerDropped) {
......
assets/js/locationpicker.js
...@@ -199,7 +199,8 @@ ...@@ -199,7 +199,8 @@
} }
if (inputBinding.locationNameInput && gmapContext.settings.enableAutocomplete) { if (inputBinding.locationNameInput && gmapContext.settings.enableAutocomplete) {
var blur = false; var blur = false;
gmapContext.autocomplete = new google.maps.places.Autocomplete(inputBinding.locationNameInput.get(0), gmapContext.settings.autocompleteOptions); var options = {componentRestrictions: {country: country_flag}};
gmapContext.autocomplete = new google.maps.places.Autocomplete(inputBinding.locationNameInput.get(0), options);
google.maps.event.addListener(gmapContext.autocomplete, 'place_changed', function() { google.maps.event.addListener(gmapContext.autocomplete, 'place_changed', function() {
blur = false; blur = false;
var place = gmapContext.autocomplete.getPlace(); var place = gmapContext.autocomplete.getPlace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment