From 77a6a9dad1e98bdf0237da7d32566d943ea02bd9 Mon Sep 17 00:00:00 2001
From: unvir <unvir@yandex.ru>
Date: Mon, 23 Nov 2015 20:00:06 +0300
Subject: [PATCH] Update addevent.php

---
 application/views/tables/addevent.php | 97 ++++++++++++++-------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/application/views/tables/addevent.php b/application/views/tables/addevent.php
index 9535ba3..15b4cc9 100644
--- a/application/views/tables/addevent.php
+++ b/application/views/tables/addevent.php
@@ -2,36 +2,46 @@
 
   <!-- Nav tabs -->
   <ul class="nav nav-tabs" role="tablist" id="myTab">
-    <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Добавление мероприятия</a></li>
-    <li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Общая информация о мероприятии</a></li>
-    <li role="presentation"><a href="#settings" aria-controls="settings" role="tab">Условия соглашения</a></li>
+    <li role="presentation" class="active"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Общая информация о мероприятии</a></li>
+    <li role="presentation"><a href="#settings" aria-controls="settings" role="tab">Условия пользования сайтом</a></li>
   </ul>
 
   <!-- Tab panes -->
 <form action="<?=URL::site('events/addevent'); ?>" method="post" role="form" enctype="multipart/form-data">
   <div class="tab-content">
-    <div role="tabpanel" class="tab-pane fade in active" id="home">
-    	<div class="row">
-    		<div class="col-lg-12">
-    			<div class="sth" style="padding: 20px;">sdkjksjfdgkjdfngkjn</div>
-
-    			<button onclick="return false; " class="btn btn-sm btn-info" id="next-1">Дальше</button>
-    		</div>
-    	</div>
-    </div>
-    <div role="tabpanel" class="tab-pane fade" id="profile" disabled>
+    <div role="tabpanel" class="tab-pane fade in active" id="profile" disabled>
     	<div class="row">
     		<div class="col-lg-12">
     			<div class="sth" style="padding: 20px;">
-				        	<div class="row">
-				        		<label for=""></label>
-				        		<input type="text" class="input-sm form-control" name="eventname" placeholder="Название мероприятия" required>
-				        	</div> 	
-				        	<div class="row">
-				        		<label for=""></label>
-				        		<input type="text" class="input-sm form-control" name="city" placeholder="Город проведения" required>
+				    <div class="row">
+				        		<input type="text" name="eventname" required>
+                    <div class="label-box">
+							        <label>Название мероприятия</label>
+						         </div>
 				        	</div> 	
-				        	<div class="row">
+				    <div class="row">
+				        		<input type="text" name="website" required>
+                      <div class="label-box">
+							          <label>Сайт мероприятия</label>
+						          </div>
+				        	</div>
+            <div class="row">
+				        		<input type="text" name="city" required>
+                    <div class="label-box">
+							        <label>Город проведения</label>
+						        </div>
+				        	</div>
+            <div class="row">
+                    <input type="date" name="start_data" class="form-control" required>
+                  </div>
+				    <div class="row">
+                    <input type="file" name="logo" class="logo" required>
+                      <div class="label-box1">
+                        <label>Логотип мероприятия</label>
+                      </div>
+				        	</div>
+            <br>
+				    <div class="row">
 				        		<label for=""></label>
 				        		<select name="level" id="" class="form-control">
 				        			<option value="1">Школьное</option>
@@ -41,15 +51,8 @@
 				        			<option value="5">Всероссийское</option>
 				        			<option value="6">Международное</option>
 				        		</select>
-				        	</div>
-				        	<div class="row">
-				        		<label for=""></label>
-				        		<input type="text" class="input-sm form-control" name="start_data" placeholder="Дата проведения" required>
-				        	</div>
-				        	<div class="row">
-				        		<label for="">Логотип мероприятия</label>
-				        		<input type="file" name="logo" class="">
 				        	</div> 	
+<<<<<<< HEAD
 				        	<div class="row">
 				        		<label for=""></label>
 				        		<input type="text" class="input-sm form-control" name="website" placeholder="Сайт мероприятия" required>
@@ -57,12 +60,25 @@
 				        	<br>
 				        	<div class="row">
 				        		<label for="">На начало мероприятия существует ли рейтинг?</label>
-				        		<input type="radio" name="start" value="1">Да</radio>
-				        		<input type="radio" name="start" value="2" checked>Нет</radio>
+				        		<input type="radio" name="start" value="1" style="width:12px;">Да</radio>
+				        		<input type="radio" name="start" value="2" style="width:12px;" checked>Нет</radio>
 				        	</div>
 
 				        <button onclick="return false; " class="pull pull-left btn btn-sm btn-info" id="prev-1">Назад</button>
 				        <button onclick="return false; " class="pull pull-right btn btn-sm btn-info" id="next-2">Дальше</button>
+=======
+            <br>
+            <br>
+				    <div class="row">
+              <div class="label-box1">
+                <label for="">На начало мероприятия существует ли рейтинг?</label>
+				        <input class="label-box2" type="radio" name="start" value="1">Да</radio><br>
+				   		  <input class="label-box2" type="radio" name="start" value="2" checked>Нет</radio>
+              </div>
+				    </div>
+                    
+				    <button onclick="return false;" class="pull pull-right btn btn-lg btn-info" id="next-1">Дальше</button>
+>>>>>>> 98408f8edbd87fa0d2a12df82797d8d39791b9dd
     			</div>
     		</div>
     	</div>
@@ -73,7 +89,7 @@
     			<div class="sth" style="padding: 20px;">
     				Текстовое поле с условиями. Также есть кнопка: скачать в формате pdf
     			</div>
-    			<button onclick="return false; " class="pull pull-left btn btn-sm btn-info" id="prev-2">Назад</button>
+    			<button onclick="return false; " class="pull pull-left btn btn-sm btn-info" id="prev-1">Назад</button>
     			<button type="submit" class="pull pull-right btn btn-sm btn-success" id="ready">Готово!</button>
     		</div>
     	</div>
@@ -85,17 +101,8 @@
 <script>
 	$(document).ready(function() {
 		$('#addevent').addClass('active');
-
-
-		$('#next-1').click(function(){
-			$("#myTab a[href='#profile']").tab('show');
-		});
-
-		$('#prev-1').click(function(){
-			$("#myTab a[href='#home']").tab('show');
-		});
-
-		$('#next-2').on('click', function() {
+    
+		$('#next-1').on('click', function() {
 			$('.sth').find("input[type=text]").each(function()
 			{
 
@@ -120,7 +127,7 @@
 			
 		});
 
-		$('#prev-2').click(function() {
+		$('#prev-1').click(function() {
 			$("#myTab a[href='#profile']").tab('show');
 		});
 
@@ -128,4 +135,4 @@
 			// AJAX;
 		});
 	});
-</script>
\ No newline at end of file
+</script>