diff --git a/_class/class_camp_user.php b/_class/class_camp_user.php index 99bf367..dcac415 100644 --- a/_class/class_camp_user.php +++ b/_class/class_camp_user.php @@ -158,7 +158,7 @@ class camp_user { public function update_login_time($_cu_id = null) { global $sql; //az adott user_id-n updateli a login_time-ot - $sql->update_table('camp_user', array('cu_last_login' => date('Y-m-d')), array('cu_id' => (empty($_cu_id)?$this->get_cu_id():$_cu_id))); + $sql->update_table('camp_user', array('cu_last_login' => date('Y-m-d H:i:s')), array('cu_id' => (empty($_cu_id)?$this->get_cu_id():$_cu_id))); } diff --git a/_css/camp.css b/_css/camp.css index 2ae4a5b..6f4edda 100644 --- a/_css/camp.css +++ b/_css/camp.css @@ -103,9 +103,6 @@ h2 { margin: 30px auto 20px auto; } -#submit_apply { - display: none; -} .accept_terms_box a, .accept_terms_box a:link, .accept_terms_box a:visited, .accept_terms_box a:active { color: #000; @@ -113,4 +110,9 @@ h2 { .accept_terms_box a:hover { text-decoration: underline; +} + +input.apply { + font-size: 20px; + font-weight: bold; } \ No newline at end of file diff --git a/_include/include_camps.php b/_include/include_camps.php index 69476ab..966abb3 100644 --- a/_include/include_camps.php +++ b/_include/include_camps.php @@ -72,12 +72,6 @@ if ($this->is_id()) { //lekérjük a státuszt //TODO: objektummal $status = $sql->single_variable('SELECT cas_name FROM camp_apply_status WHERE cas_id = ' . $new_apply->get_capp_status()); - if ($new_apply->get_capp_status() == 3) { - $color = "green"; - } - else { - $color = "red"; - } $new_apply->set_capp_status($status); $apply_array[] = $new_apply; } @@ -104,7 +98,6 @@ if ($this->is_id()) { //var_dump($apply_array_3); - $smarty->assign('color', $color); $smarty->assign('apply_array', $apply_array); $smarty->assign('pending_apply_array', $apply_array_2); $smarty->assign('deleted_apply_array', $apply_array_3); diff --git a/common.php b/common.php index f81d6c3..e12c811 100644 --- a/common.php +++ b/common.php @@ -99,6 +99,8 @@ $smarty->assign('error_msg', $error_msg); if ($_SERVER['HTTP_HOST'] == 'badmintoncoach.hu') $sql = new sql('bc_mysql','root','','badminton_coach'); else $sql = new sql('localhost','tollashodos','uprRscU8bGpJ','tollashodos'); +$dev = $_SERVER['HTTP_HOST'] == 'badmintoncoach.hu'; + //var_dump($sql); //echo $_GET['page']; diff --git a/index.php b/index.php index a40ee5c..6a2478e 100644 --- a/index.php +++ b/index.php @@ -103,7 +103,13 @@ setlocale(LC_ALL, 'hu_HU'); }); - + is_page() && ($page->get_page() == 'tabor' && !$dev)) { + ?> + + diff --git a/template/templates/camp_apply.tpl b/template/templates/camp_apply.tpl index 5cd8bf5..995483c 100644 --- a/template/templates/camp_apply.tpl +++ b/template/templates/camp_apply.tpl @@ -219,7 +219,7 @@
- +
@@ -373,11 +373,10 @@ $("#cc_list").change(function() { $("#accept_terms").change(function() { if ($("#accept_terms").is(':checked')) { - $("#submit_apply").show(); - $("#submit_apply").css('display', 'block'); + $("#submit_apply").prop('disabled', false); } else { - $("#submit_apply").hide(); + $("#submit_apply").prop('disabled', true); } }); diff --git a/template/templates/camp_data_update.tpl b/template/templates/camp_data_update.tpl index 0dc5e84..c6107c0 100644 --- a/template/templates/camp_data_update.tpl +++ b/template/templates/camp_data_update.tpl @@ -167,7 +167,7 @@ {$apply->get_capp_date()|substr:0:16} - + {$apply->get_capp_status()} diff --git a/template/templates/camp_list.tpl b/template/templates/camp_list.tpl index 023569e..fc08b3d 100644 --- a/template/templates/camp_list.tpl +++ b/template/templates/camp_list.tpl @@ -29,7 +29,7 @@
has_pending_apply() || $camp->has_deleted_apply()}style="background-color: #ff9205;"{/if}> {$camp->get_camp_from()|substr:0:4}. - {$months[$camp->get_camp_from()|date_format:"%m"]}. {$camp->get_camp_from()|date_format:"%e"}. - + {$months[$camp->get_camp_from()|date_format:"%m"]} {$camp->get_camp_from()|date_format:"%e"}. - {if $camp->get_camp_from()|date_format:"%m" != $camp->get_camp_to()|date_format:"%m"} {$months[$camp->get_camp_to()|date_format:"%m"]}. {/if} @@ -78,7 +78,11 @@ $( document ).ready(function() { $( ".list" ).find( divs ).hide(); var div_list = $( ".list" ).find( divs ); - open_block(div_list[0].id); + //open_block(div_list[0].id); + //alert(div_list.length); + for (var i = 0; i <= div_list.length - 1; i++) { + open_block(div_list[i].id); + } });