Styled the itinerary screen.

www-admin/actividades/add/add.php

@@ -121,7 +121,7 @@
 		
 		//Insert into database and get id
 		mysqli_query($con, "INSERT INTO activity (permalink, date, title_es, title_eu, title_en, text_es, text_eu, text_en, price, inscription, max_people, user, visible, comments, city) VALUES('$permalink', $date, '$title_es', '$title_eu', '$title_en', '$text_es', '$text_eu', '$text_en', $price, $inscription, $people, $user, $visible, $comments, '$city');");
-		$q = mysqli_query($con, "SELECT id FROM activity WHERE permalink = '$permalink' ORDER BY time DESC LIMIT 1;");
+		$q = mysqli_query($con, "SELECT id FROM activity WHERE permalink = '$permalink' ORDER BY dtime DESC LIMIT 1;");
 		$r = mysqli_fetch_array($q);
 		$id = $r['id'];
 		

www-admin/actividades/add/index.php

@@ -27,33 +27,46 @@
 		<?php include('../../toolbar.php'); ?>
 		<div id='content'>
 			<div class="section">
-				<h3>Nueva actividad</h3>
-				<form action="add.php" maxlength="120" method="post" enctype="multipart/form-data" onsubmit="return validateActivity();">
-					<span class="tab_selector pointer" id="tab_selector_es" onClick="showTab('es');">Castellano</span>
-					<span class="tab_selector tab_selector_hidden pointer" id="tab_selector_eu" onClick="showTab('eu');">Euskera</span>
-					<span class="tab_selector tab_selector_hidden pointer" id="tab_selector_en" onClick="showTab('en');">Ingles</span>
-					<br/>
-					<div class="section tab_content" id="tab_content_es">
-						<input type="text" id="title_es" name="title_es" placeholder="Titulo (castellano)"/><br/><br/>
-						<textarea name="text_es" id="text_es" placeholder="Texto (castellano)"></textarea>
-						<script>
-							CKEDITOR.replace('text_es');
-						</script>
-					</div>
-					<div class="section tab_content section tab_content_hidden" id="tab_content_eu">
-						<input type="text" id="title_eu" name="title_eu" placeholder="Titulo (euskera)"/><br/><br/>
-						<textarea name="text_eu" id="text_eu" placeholder="Texto (euskera)"></textarea>
-						<script>
-							CKEDITOR.replace('text_eu');
-						</script>
-					</div>
-					<div class="section tab_content section tab_content_hidden" id="tab_content_en">
-						<input type="text" id="title_en" name="title_en" placeholder="Titulo (ingles)"/><br/><br/>
-						<textarea name="text_en" id="text_en" placeholder="Texto (ingles)"></textarea>
-						<script>
-							CKEDITOR.replace('text_en');
-						</script>
-					</div>
+				<h3 class="section_title">Nueva actividad</h3>
+				<form action="/actividades/add/add.php" maxlength="120" method="post" enctype="multipart/form-data" onsubmit="return validateActivity();">
+					<div class="entry">
+						<div id="lang_tabs">
+							<table>
+								<tr>
+									<td class="pointer lang_tabs_active" id="lang_tab_es" onclick="showLanguage('es');">
+										Castellano
+									</td>
+									<td class="pointer" id="lang_tab_eu" onclick="showLanguage('eu');">
+										Euskera
+									</td>
+									<td class="pointer" id="lang_tab_en" onclick="showLanguage('en');">
+										Ingl&eacute;s
+									</td>
+								</tr>
+							</table>
+						</div>
+						<div id="content_lang_es">
+							<input type="text" id="title_es" name="title_es" placeholder="Titulo"/><br/><br/>
+							<textarea name="text_es" id="text_es" placeholder="Texto"></textarea>
+							<script>
+								CKEDITOR.replace('text_es');
+							</script>
+						</div>
+						<div id="content_lang_eu" style="display:none;">
+							<input type="text" id="title_eu" name="title_eu" placeholder="Titulu"/><br/><br/>
+							<textarea name="text_eu" id="text_eu" placeholder="Textua"></textarea>
+							<script>
+								CKEDITOR.replace('text_eu');
+							</script>
+						</div>
+						<div id="content_lang_en" style="display:none;">
+							<input type="text" id="title_en" name="title_en" placeholder="Title"/><br/><br/>
+							<textarea name="text_en" id="text_en" placeholder="Content"></textarea>
+							<script>
+								CKEDITOR.replace('text_en');
+							</script>
+						</div>
+					</div> <!--Entry-->
 					<div class="entry" id="activity_images">
 						<h4>Detalles</h4>
 						Ciudad:<input type="text" name="city" length="30" value="Vitoria-Gasteiz"/><br/><br/>
@@ -66,9 +79,8 @@
 						<input type="text" length="2" name="minute" placeholder="mm"/>-->
 						<br/><br/>Precio (en blanco si es gratuita):
 						<input type="text" length="4" name="price" placeholder="eur"/>
-						<br/><label><input type="checkbox" name="inscription" checked/>Se requiere inscripcion</label>
-						<br/>Numero de plazas (en blanco para ilimitadas): <input type="text" length="4" name="people" placeholder="#"/>
-						
+						<br/><br/><label><input type="checkbox" name="inscription" checked/>Se requiere inscripcion</label>
+						<br/><br/>Numero de plazas (en blanco para ilimitadas): <input type="text" length="4" name="people" placeholder="#"/>
 						
 						<h4>Imagenes</h4>
 						<ul>
@@ -104,8 +116,11 @@
 						<label><input type="checkbox" name="comments" checked/>Permitir comentarios</label><br/><br/>
 						<label><input type="checkbox" name="admin"/>Publicar como Gasteizko Margolariak en lugar de mi nombre</label>
 						<br/><br/><br/><br/>
-						<input type="button" value="Previsualizar" onClick="alert(validateActivity());"/> <!--TODO-->
-						<input type="submit" value="Publicar"/>
+						<div id="button_container">
+							<input type="button" value="Previsualizar" onClick="alert(validateActivity());"/> <!--TODO-->
+							</br>
+							<input type="submit" value="Publicar"/>
+						</div>
 					</div>
 				</form>
 			</div>

www-admin/actividades/add/itinerary.php

@@ -37,50 +37,73 @@
 		<?php include('../../toolbar.php'); ?>
 		<div id='content'>
 			<div class='section'>
+				<h3 class="section_title">Modificar itinerario</h3>
 				<form action='additinerary.php' method='post'>
-					<input type='hidden' name='activity' value='<?php echo $id; ?>'/>
-					<table id='itinerary'>
-					<?php
-						$q_place = mysqli_query($con, "SELECT id, name_es FROM place ORDER BY name_es;");
-						$i = 0;
-						for ($i = 0; $i < 50; $i ++){
-							echo "<tr id='itinerary_row_$i' class='itinerary_row'>\n";
-							echo "<td class='itinerary_cell time'>\n";
-							echo "<h4>Hora y lugar</h4><table>\n";
-							echo "<tr><td>Inicio*</td><td><input type='number' maxlength='2' name='sh_$i' id='sh_$i' onChange='showNextRow($i);'/></td><td>: <input type='number' maxlength='2' name='sm_$i' id='sm_$i' onChange='showNextRow($i);'/><td/></tr>\n";
-							echo "<tr><td>Final</td><td><input type='number' maxlength='2' name='eh_$i' id='eh_$i' onChange='showNextRow($i);'/></td><td>: <input type='number' maxlength='2' name='em_$i' id='em_$i' onChange='showNextRow($i);'/><td/></tr>\n";
-							echo "</table>\n";
-							echo "Lugar*: <select name='place_$i' id='place_$i' onChange='showNextRow($i);'>\n";
-							echo "<option value='-1'>SELECCIONA</option>\n";
-							mysqli_data_seek($q_place, 0);
-							while ($r_place = mysqli_fetch_array($q_place)){
-								echo "<option value='$r_place[id]'>$r_place[name_es]</option>\n";
+					<div class="entry">
+						<input type='hidden' name='activity' value='<?php echo $id; ?>'/>
+						<table id='itinerary'>
+						<?php
+							$q_place = mysqli_query($con, "SELECT id, name_es FROM place ORDER BY name_es;");
+							$i = 0;
+							for ($i = 0; $i < 50; $i ++){
+								echo "<tr id='itinerary_row_$i' class='itinerary_row'>\n";
+								echo "<td class='itinerary_cell time'>\n";
+								echo "<h4>Hora y lugar</h4>\n";
+								echo "Inicio*:&nbsp<input type='number' maxlength='2' name='sh_$i' id='sh_$i' onChange='showNextRow($i);'/>:<input type='number' maxlength='2' name='sm_$i' id='sm_$i' onChange='showNextRow($i);'/>\n";
+								echo "<br/>Final:&nbsp<input type='number' maxlength='2' name='eh_$i' id='eh_$i' onChange='showNextRow($i);'/>:<input type='number' maxlength='2' name='em_$i' id='em_$i' onChange='showNextRow($i);'/>\n";
+								echo "<br/><br/>\n";
+								echo "Lugar*: <select name='place_$i' id='place_$i' onChange='showNextRow($i);'>\n";
+								echo "<option value='-1'>SELECCIONA</option>\n";
+								mysqli_data_seek($q_place, 0);
+								while ($r_place = mysqli_fetch_array($q_place)){
+									echo "<option value='$r_place[id]'>$r_place[name_es]</option>\n";
+								}
+								echo "</select><br/>\n";
+								echo "<span id='add_place' class='pointer' onClick='addPlace($i);'>A&ntilde;adir nuevo lugar</span>\n";
+								echo "</td>\n";
+								echo "<td class='itinerary_cell itinerary_cell_content'>\n";
+							?>
+							<div id='lang_tabs'>
+	                                                        <table>
+               		                                                <tr>
+                               		                                        <td class="pointer lang_tabs_active" id="lang_tab_es" onclick="showLanguage('es');">
+                                               		                                Castellano
+                                                               		        </td>
+	                                                                        <td class="pointer" id="lang_tab_eu" onclick="showLanguage('eu');">
+               		                                                                Euskera
+                               		                                        </td>
+                                               		                        <td class="pointer" id="lang_tab_en" onclick="showLanguage('en');">
+                                                               		                Ingl&eacute;s
+                                                                       		</td>
+                       			                                 </tr>
+                                               		        </table>
+		                                                </div>
+	               		                                <div id="content_lang_es">
+									<h4>T&iacute;tulo</h4>
+									<input type='text' name='title_es_<?php echo($i); ?>' id='title_es_<?php echo($i); ?>' onKeyUp='showNextRow(<?php echo($i); ?>'/>
+									<h4>Texto</h4>
+									<textarea name='text_es_<?php echo($i); ?>' id='text_es_<?php echo($i); ?>' onKeyUp='showNextRow(<?php echo($i); ?>);'/></textarea>
+								</div>
+								<div id="content_lang_eu" style="display:none;">
+                                                                        <h4>Titulo</h4>
+                                                                        <input type='text' name='title_eu_<?php echo($i); ?>' id='title_eu_<?php echo($i); ?>' onKeyUp='showNextRow(<?php echo($i); ?>'/>
+                                                                        <h4>Textua</h4>
+                                                                        <textarea name='text_eu_<?php echo($i); ?>' id='text_eu_<?php echo($i); ?>' onKeyUp='showNextRow(<?php echo($i); ?>);'/></textarea>
+                                                                </div>
+								<div id="content_lang_en" style="display:none;">
+                                                                        <h4>Title</h4>
+                                                                        <input type='text' name='title_en_<?php echo($i); ?>' id='title_en_<?php echo($i); ?>' onKeyUp='showNextRow(<?php echo($i); ?>'/>
+                                                                        <h4>Content</h4>
+                                                                        <textarea name='text_en_<?php echo($i); ?>' id='text_en_<?php echo($i); ?>' onKeyUp='showNextRow(<?php echo($i); ?>);'/></textarea>
+                                                                </div>
+								<?php
+									echo("</td>\n");
+									echo("</tr>\n");
 							}
-							echo "</select><br/>\n";
-							echo "<span id='add_place' class='pointer' onClick='addPlace($i);'>A&ntilde;adir nuevo lugar</span>\n";
-							
-							echo "</td>\n";
-							echo "<td class='itinerary_cell title'>\n";
-							echo "<h4>T&iacute;tulo</h4><table>\n";
-							echo "<tr><td>Castellano*</td><td><input type='text' name='title_es_$i' id='title_es_$i' onKeyUp='showNextRow($i);'/></td></tr>\n";
-							echo "<tr><td>Ingl&eacute;s</td><td><input type='text' name='title_en_$i' id='title_en_$i' onKeyUp='showNextRow($i);'/></td></tr>\n";
-							echo "<tr><td>Euskera</td><td><input type='text' name='title_eu_$i' id='title_eu_$i' onKeyUp='showNextRow($i);'/></td></tr>\n";
-							echo "</table>\n";
-							echo "</td>\n";
-							echo "<td class='itinerary_cell text'>\n";
-							echo "<h4>Texto castellano*</h4><textarea name='text_es_$i' id='text_es_$i' onKeyUp='showNextRow($i);'/></textarea>\n";
-							echo "</td>\n";
-							echo "<td class='itinerary_cell text'>\n";
-							echo "<h4>Texto ingl&eacute;s</h4><textarea name='text_en_$i' id='text_en_$i' onKeyUp='showNextRow($i);'/></textarea>\n";
-							echo "</td>\n";
-							echo "<td class='itinerary_cell text'>\n";
-							echo "<h4>Texto euskera</h4><textarea name='text_eu_$i' id='text_eu_$i' onKeyUp='showNextRow($i);'/></textarea>\n";
-							echo "</td>\n";
-							echo "</tr>\n";
-						}
-					?>
-				</table>
-				<input type='submit' value='Guardar'/>
+						?>
+					</table>
+					<input type='submit' id="save_itinerary"  value='Guardar'/>
+				</div> <!--Entry-->
 			</form>
 		</div>
 	</body>

www-admin/actividades/moderate/index.php

@@ -11,7 +11,7 @@
 	<head>
 		<meta content="text/html; charset=windows-1252" http-equiv="content-type"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
-		<title>Nuevo post - Administracion</title>
+		<title>Moderar comentarios - Administracion</title>
 		<!-- CSS files -->
 		<link rel="stylesheet" type="text/css" href="/css/ui.css"/>
 		<link rel="stylesheet" type="text/css" href="/css/blog.css"/>
@@ -23,6 +23,13 @@
 		<script type="text/javascript" src="/script/ui.js"></script>
 	</head>
 	<body>
+		<?php include('../../toolbar.php'); ?>
+                <div id='content'>
+                        <div class="section">
+                                <h3 class="section_title">Moderar comentarios</h3>
+                                <h4 span class="TODO">En construcci&oacute;n</h4>
+                        </div>
+                </div>
 	</body>
 </html>
 

www-admin/css/actividades.css

@@ -1,68 +1,21 @@
 /* /actividades/add/index.php */
 
-span.tab_selector{
-	z-index:					1;
-	position:					relative;
-	margin-bottom:				0;
-	margin-right:				1em;
-	margin-left:				1em;
-	border-top:					0.1em solid #000000;
-	border-left:				0.1em solid #000000;
-	border-right:				0.1em solid #000000;
-	border-top-right-radius:	0.3em;
-	border-top-left-radius:		0.3em;
-	padding:					0.5em 0.5em 0.1em 0.5em;
-	background-color:			#cccccc;
-	font-weight:				bold;
-}
-
-span#tab_selector_es{
-	z-index:	3;
-}
-
-span#tab_selector_en{
-	color:			#8899bb;
-}
-
-span#tab_selector_eu{
-	color:			#8899bb;
-}
-
-span.tab_selector_hidden{
-	border-bottom:	0.1em solid #000000;
-}
-
-div.tab_content{
-	z-index:			2;
-	position:			relative;
-	display:			inline-block;
-	vertical-align:		top;
-	margin-top:			-0.1em;
-	background-color:	#cccccc;
-	width:				30%;
-	min-width:			25em;
-	text-align:			center;
-}
-
-div.tab_content input[type="text"]{
-	width:		90%;
+input[type="text"]{
+	width:	100%;
 }
 
-div.tab_content textarea{
-	width:		90%;
-	height:		25em;
-	resize: 	none;
+textarea{
+	width:		100%;
+	height:		20em;
 }
 
 div.tab_content_hidden{
 	display:	none;
 }
 
-div#activity_images{
-	display:		inline-block;
-	width:			40%;
-	min-width:		20em;
-	vertical-align:	top;
+div#activity_images input[name="city"]{
+        width:  	100%;
+	max-width:	15em;
 }
 
 div#activity_images input[name="day"]{
@@ -103,13 +56,17 @@ img.image_upload_preview{
 	vertical-align:	middle;
 }
 
-div#activity_options{
-	width:			15%;
-	min-width:		14em;
-	display:		inline-block;
-	vertical-align:	top;
+/* Buttons */
+div#button_container{
+        text-align:     center;
+}
+
+div#button_container input{
+        width:  30%;
+        margin: 0.5em auto 0.5em auto;
 }
 
+
 /* Translate page */
 
 div#translation_instructions{
@@ -198,8 +155,9 @@ div.translate_row_itinerary table td textarea{
 
 /* /actividades/add/itinerary.php */
 table#itinerary{
+	margin:			1em;
 	border-collapse:	collapse; 
-	border:				0.1em solid #000000;
+	border:			0.1em solid #000000;
 }
 
 table#itinerary tr.itinerary_row{
@@ -214,13 +172,23 @@ table#itinerary tr#itinerary_row_0{
 }
 
 table#itinerary tr.itinerary_row td.itinerary_cell{
-	border:	0.1em solid #000000;
+	border:		0.1em solid #000000;
+	padding:	0.5em;
+}
+
+table#itinerary tr.itinerary_row td.itinerary_cell_content{
+        width:	100%;
 }
 
 table#itinerary tr.itinerary_row td.itinerary_cell h4{
 	margin:	0.3em;
 }
 
+table#itinerary tr.itinerary_row td.time{
+        min-width:  11em;
+}
+
+
 table#itinerary tr.itinerary_row td.time input{
 	width:	3em;
 }
@@ -243,16 +211,19 @@ table#itinerary tr.itinerary_row td.time span:hover{
 	text-decoration:	underline;
 }
 
-table#itinerary tr.itinerary_row td.title input{
-	min-width:	3em;
-}
-
 table#itinerary tr.itinerary_row td.text textarea{
 	min-width:	15em;
 	height:		7em;
 	resize:		none;
 }
 
+input#save_itinerary{
+	width:	30%;
+	margin:	1em 30% 1em 30%;
+}
+
+/* Activity list */
+
 table#activity_list{
 	border-collapse:	collapse;
 }

www-admin/main.php

@@ -46,8 +46,6 @@
 								<ul>
 									<li><a href='/actividades/add/'>Nueva actividad</a></li>
 									<li><a href='/actividades/'>Gestionar actividades</a></li>
-									<li><a href='/actividades/moderate/'>Moderar comentarios</a></li>
-									<li><a href='/actividades/translate/'>Traducir actividades</a></li>
 								</ul>
 							</div>
 						</div>

www-admin/toolbar.php

@@ -52,12 +52,6 @@
 			<td>
 				<a href="http://<?php echo $http_host; ?>/actividades/">Gestionar actividades</a>
 			</td>
-			<td>
-				<a href="http://<?php echo $http_host; ?>/actividades/moderate/">Moderar comentarios</a>
-			</td>
-			<td>
-				<a href="http://<?php echo $http_host; ?>/actividades/translate/">Traducir actividades</a>
-			</td>
 		</tr>
 	</table>
 </div>