Pārlūkot izejas kodu

UI and usability improvements for several administration pages

seavenois 10 gadi atpakaļ
vecāks
revīzija
a87b9ae5b2

+ 10 - 1
www-admin/actividades/add/script.js

@@ -4,6 +4,9 @@ function showTab(lang){
 			document.getElementById('tab_content_es').style.display = 'inline-block';
 			document.getElementById('tab_content_eu').style.display = 'none';
 			document.getElementById('tab_content_en').style.display = 'none';
+			document.getElementById('tab_selector_es').style.color = '#000000';
+			document.getElementById('tab_selector_eu').style.color = '#8899bb';
+			document.getElementById('tab_selector_en').style.color = '#8899bb';
 			document.getElementById('tab_selector_es').style.zIndex = '3';
 			document.getElementById('tab_selector_eu').style.zIndex = '1';
 			document.getElementById('tab_selector_en').style.zIndex = '1';
@@ -15,6 +18,9 @@ function showTab(lang){
 			document.getElementById('tab_content_es').style.display = 'none';
 			document.getElementById('tab_content_eu').style.display = 'inline-block';
 			document.getElementById('tab_content_en').style.display = 'none';
+			document.getElementById('tab_selector_es').style.color = '#8899bb';
+			document.getElementById('tab_selector_eu').style.color = '#000000';
+			document.getElementById('tab_selector_en').style.color = '#8899bb';
 			document.getElementById('tab_selector_es').style.zIndex = '1';
 			document.getElementById('tab_selector_eu').style.zIndex = '3';
 			document.getElementById('tab_selector_en').style.zIndex = '1';
@@ -26,6 +32,9 @@ function showTab(lang){
 			document.getElementById('tab_content_es').style.display = 'none';
 			document.getElementById('tab_content_eu').style.display = 'none';
 			document.getElementById('tab_content_en').style.display = 'inline-block';
+			document.getElementById('tab_selector_es').style.color = '#8899bb';
+			document.getElementById('tab_selector_eu').style.color = '#8899bb';
+			document.getElementById('tab_selector_en').style.color = '#000000';
 			document.getElementById('tab_selector_es').style.zIndex = '1';
 			document.getElementById('tab_selector_eu').style.zIndex = '1';
 			document.getElementById('tab_selector_en').style.zIndex = '3';
@@ -172,4 +181,4 @@ function showNextRow(current){
 	else{
 		document.getElementById('itinerary_row_' + (current + 1)).style.display = 'none';
 	}
-}
+}

+ 3 - 3
www-admin/actividades/index.php

@@ -16,10 +16,10 @@
 		<title>Actividades - Administracion</title>
 		<!-- CSS files -->
 		<link rel="stylesheet" type="text/css" href="/css/ui.css"/>
-		<link rel="stylesheet" type="text/css" href="/css/blog.css"/>
+		<link rel="stylesheet" type="text/css" href="/css/actividades.css"/>
 		<!-- CSS for mobile version -->
 		<link rel="stylesheet" type="text/css" media="(max-width : 990px)" href="/css/m/ui.css"/>
-		<link rel="stylesheet" type="text/css" media="(max-width : 990px)" href="/css/m/blog.css"/>
+		<link rel="stylesheet" type="text/css" media="(max-width : 990px)" href="/css/m/activiadades.css"/>
 		<!-- Script files -->
 		<script type="text/javascript" src="/script/ui.js"></script>
 	</head>
@@ -55,7 +55,7 @@
 								echo "<td class='activity_column_details'>$r[ptime]<br/>Por $r_user[username]<br/>Comentarios:";
 								// TODO: itinerary?
 								if ($r['comments'] == 1){
-									$q_comments = mysqli_query($con, "SELECT id FROM activity_comment WHERE post = $row[id];");
+									$q_comments = mysqli_query($con, "SELECT id FROM activity_comment WHERE activity = $r[id];");
 									echo "Si (" . mysqli_num_rows($q_comments) . ")";
 								}
 								else

+ 3 - 2
www-admin/actividades/translate/index.php

@@ -28,10 +28,11 @@
 				<h3>Lista de actividades</h3>
 				<div class='entry'>
 					<?php
-						$q = mysqli_query($con, "SELECT * FROM activity;");
-						echo "<table class='translation_table'><tr><th>Nombre</th><th>Ingles</th><th>Euskera</th></tr>\n";
+						$q = mysqli_query($con, "SELECT id, title_es, title_eu, title_en, text_es, text_en, text_eu, DATE_FORMAT(date, '%b %d, %Y') AS dat FROM activity ORDER BY date;");
+						echo "<table class='translation_table'><tr><th>Nombre</th><th>Fecha</th><th>Ingles</th><th>Euskera</th></tr>\n";
 						while ($r = mysqli_fetch_array($q)){
 							echo "<tr><td><a href='http://$http_host/actividades/translate/translate.php?id=$r[id]'>$r[title_es]</a></td>";
+							echo("<td>$r[dat]</td>");
 							$total = 2; //Title and text are mandatory
 							$translated_en = 0;
 							$translated_eu = 0;

+ 2 - 1
www-admin/actividades/translate/translate.php

@@ -46,6 +46,7 @@
 					echo "</div><br/><br/>\n";
 					echo "<form method='post' action='http://$http_host/actividades/translate/apply.php'>\n";
 					echo "<input type='hidden' name='id' value='$r[id]'/>\n";
+					
 					echo "<table id='table_translate_languages'><tr>\n";
 					echo "<td class='translate_language'><div class='entry translation'>\n";
 					echo "<h3>Castellano</h4><div class='translate_row_title'>\n<span class='bold'>T&iacute;tulo: </span>$r[title_es]</div>\n";
@@ -98,7 +99,7 @@
 						echo "</table></div>\n";
 					}
 					echo "</div></td>\n";
-					
+										
 					echo "</tr></table><div id='translate_controls'><input type='submit' value='Guardar'/><input type='button' value='Cancelar y salir' onClick='exitTranslation();'/></div></form>\n";
 				?>
 			</div>

+ 67 - 64
www-admin/blog/add/index.php

@@ -25,70 +25,73 @@
 		<script src="../../ckeditor/ckeditor.js"></script>
 	</head>
 	<body>
-		<div class="section">
-			<h3>Nuevo post</h3>
-			<form action="add.php" maxlength="120" method="post" enctype="multipart/form-data" onsubmit="return validate_post();">
-				<div class="entry blog_add_language">
-					<h4>Castellano (obligatorio)</h4>
-					<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 class="entry blog_add_language">
-					<h4>Euskera (opcional)</h4>
-					<input type="text" name="title_eu" id="title_eu" placeholder="Titulo"><br/><br/>
-					<textarea name="text_eu" id="text_eu" placeholder="Texto"></textarea>
-					<script>
-						CKEDITOR.replace('text_eu');
-					</script>
-				</div>
-				<div class="entry blog_add_language">
-					<h4>Ingles (opcional)</h4>
-					<input type="text" name="title_en" id="title_en" placeholder="Titulo"><br><br/>
-					<textarea name="text_en" id="text_en" placeholder="Texto"></textarea>
-					<script>
-						CKEDITOR.replace('text_en');
-					</script>
-				</div>
-				<div class="entry" id="images">
-					<h4>Imagenes</h4>
-					<ul>
-						<li>
-							Principal (Aparecera sobre el texto y en las previsualizaciones)<br/>
-							<div class="image_upload_container">
-								<img class="image_upload_preview" id="image_preview_0" src="/img/misc/alpha.png"/><br/><br/>
-								<input id="image_0" onchange="preview_image(this, image_preview_0);" type="file" name="image_0" accept="image/x-png, image/gif, image/jpeg"/>
-							</div>
-						</li>
-						<li>
-							Secundarias (Bajo el texto)<br/>
-							<div class="image_upload_container">
-								<img class="image_upload_preview" id="image_preview_1" src="/img/misc/alpha.png"/><br/><br/>
-								<input id="image_1" onchange="preview_image(this, image_preview_1);" type="file" name="image_1" accept="image/x-png, image/gif, image/jpeg"/>
-							</div>
-							<div class="image_upload_container">
-								<img class="image_upload_preview" id="image_preview_2" src="/img/misc/alpha.png"/><br/><br/>
-								<input id="image_2" onchange="preview_image(this, image_preview_2);" type="file" name="image_2" accept="image/x-png, image/gif, image/jpeg"/>
-							</div>
-							<div class="image_upload_container">
-								<img class="image_upload_preview" id="image_preview_3" src="/img/misc/alpha.png"/><br/><br/>
-								<input id="image_3" onchange="preview_image(this, image_preview_3);" type="file" name="image_3" accept="image/x-png, image/gif, image/jpeg"/>
-							</div>
-						</li>
-					</ul>
-				</div>
-				<div class="entry" id="settings">
-					<h4>Ajustes</h4>
-					<label><input type="checkbox" name="visible" checked/>Post visible</label><br/><br/>
-					<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(validate_post());"/> <!--TODO-->
-					<input type="submit" value="Publicar"/>
-				</div>
-			</form>
+		<?php include('../../toolbar.php'); ?>
+		<div id='content'>
+			<div class="section">
+				<h3>Nuevo post</h3>
+				<form action="add.php" maxlength="120" method="post" enctype="multipart/form-data" onsubmit="return validate_post();">
+					<div class="entry blog_add_language">
+						<h4>Castellano (obligatorio)</h4>
+						<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 class="entry blog_add_language">
+						<h4>Euskera (opcional)</h4>
+						<input type="text" name="title_eu" id="title_eu" placeholder="Titulo"><br/><br/>
+						<textarea name="text_eu" id="text_eu" placeholder="Texto"></textarea>
+						<script>
+							CKEDITOR.replace('text_eu');
+						</script>
+					</div>
+					<div class="entry blog_add_language">
+						<h4>Ingles (opcional)</h4>
+						<input type="text" name="title_en" id="title_en" placeholder="Titulo"><br><br/>
+						<textarea name="text_en" id="text_en" placeholder="Texto"></textarea>
+						<script>
+							CKEDITOR.replace('text_en');
+						</script>
+					</div>
+					<div class="entry" id="images">
+						<h4>Imagenes</h4>
+						<ul>
+							<li>
+								Principal (Aparecera sobre el texto y en las previsualizaciones)<br/>
+								<div class="image_upload_container">
+									<img class="image_upload_preview" id="image_preview_0" src="/img/misc/alpha.png"/><br/><br/>
+									<input id="image_0" onchange="preview_image(this, image_preview_0);" type="file" name="image_0" accept="image/x-png, image/gif, image/jpeg"/>
+								</div>
+							</li>
+							<li>
+								Secundarias (Bajo el texto)<br/>
+								<div class="image_upload_container">
+									<img class="image_upload_preview" id="image_preview_1" src="/img/misc/alpha.png"/><br/><br/>
+									<input id="image_1" onchange="preview_image(this, image_preview_1);" type="file" name="image_1" accept="image/x-png, image/gif, image/jpeg"/>
+								</div>
+								<div class="image_upload_container">
+									<img class="image_upload_preview" id="image_preview_2" src="/img/misc/alpha.png"/><br/><br/>
+									<input id="image_2" onchange="preview_image(this, image_preview_2);" type="file" name="image_2" accept="image/x-png, image/gif, image/jpeg"/>
+								</div>
+								<div class="image_upload_container">
+									<img class="image_upload_preview" id="image_preview_3" src="/img/misc/alpha.png"/><br/><br/>
+									<input id="image_3" onchange="preview_image(this, image_preview_3);" type="file" name="image_3" accept="image/x-png, image/gif, image/jpeg"/>
+								</div>
+							</li>
+						</ul>
+					</div>
+					<div class="entry" id="settings">
+						<h4>Ajustes</h4>
+						<label><input type="checkbox" name="visible" checked/>Post visible</label><br/><br/>
+						<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(validate_post());"/> <!--TODO-->
+						<input type="submit" value="Publicar"/>
+					</div>
+				</form>
+			</div>
 		</div>
 	</body>
 </html>

+ 75 - 1
www-admin/css/actividades.css

@@ -11,14 +11,23 @@ span.tab_selector{
 	border-right:				0.1em solid #000000;
 	border-top-right-radius:	0.3em;
 	border-top-left-radius:		0.3em;
-	padding:					0.5em 0.5em 0 0.5em;
+	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;
 }
@@ -243,3 +252,68 @@ table#itinerary tr.itinerary_row td.text textarea{
 	height:		7em;
 	resize:		none;
 }
+
+table#activity_list{
+	border-collapse:	collapse;
+}
+
+table#activity_list td, th{
+	border: 	1px solid black;
+	padding:	0.5em;
+}
+
+table#activity_list th{
+	background-color:	#999999;
+}
+
+table#activity_list td.activity_column_title{
+	width:	10%;
+}
+
+table#activity_list td.activity_column_text{
+	width:	25%;
+}
+
+table#activity_list td.activity_column_text img{
+	max-width:	6em;
+	max-height:	4em;
+	border:		0.1em solid black;
+	margin:		0.1em;
+}
+
+table#activity_list td.activity_column_details{
+	width:		10%;
+	text-align:	center;
+}
+
+table#activity_list td.activity_column_translations{
+	width:		10%;
+	text-align:	center;
+}
+
+table#activity_list td.activity_column_action{
+	width:		10%;
+	text-align:	center;
+}
+
+table#activity_list form{
+	margin:	0;
+}
+
+table#activity_list input[type="button"], input[type="submit"]{
+	width:			90%;
+	margin-top:		0.2em;
+	margin-bottom:	0.2em;
+}
+
+div#translate_controls{
+	width:			50%;
+	margin-left:	auto;
+	margin-right:	auto;
+	text-align:		center;
+}
+
+div#translate_controls input{
+	width:		100%;
+	margin-top:	1em;
+}

+ 2 - 2
www-admin/lablanca/calculate.php

@@ -156,13 +156,13 @@
 					case '9':
 					
 						break;
-					case default:
+					default:
 						exit(-1);
 				}
 				//Load schedule tables
 				echo "<table>\n";
 				echo "<tr>\n";
-				echo "<th></th>"
+				echo "<th></th>";
 				echo "<tr/>\n";
 				echo "</table>\n";
 				break;

+ 17 - 5
www-admin/lablanca/index.php

@@ -24,8 +24,11 @@
 		<link rel="stylesheet" type="text/css" media="(max-width : 990px)" href="/css/m/lablanca.css"/>
 		<!-- Script files -->
 		<script type="text/javascript" src="script.js"></script>
+		<script type="text/javascript" src="/script/ui.js"></script>
+		<script src="../ckeditor/ckeditor.js"></script>
 	</head>
 	<body onLoad='calculate("all");'>
+		<?php include('../toolbar.php'); ?>
 		<div id='content'>
 			<div class='section' id='section_header'>
 				<h4>Paso 1: Cabecera de la p&aacute;gina de fiestas</h4>
@@ -38,20 +41,29 @@
 						<?php
 							$q = mysqli_query($con, "SELECT * FROM festival WHERE year = $year;");
 							$r = mysqli_fetch_array($q);
-							echo "<textarea onChange='updateField(\"festival\", \"text_es\", this.value, $r[id], \"text\", false);calculate(\"header\");'>$r[text_es]</textarea>\n";
+							echo "<textarea id='text_es' onChange='updateField(\"festival\", \"text_es\", this.value, $r[id], \"text\", false);calculate(\"header\");'>$r[text_es]</textarea>\n";
 						?>
+						<script>
+							CKEDITOR.replace('text_es');
+						</script>
 					</div>
 					<div class='header_text'>
 						Texto ingl&eacute;s:
 						<?php
-							echo "<textarea onChange='updateField(\"festival\", \"text_en\", this.value, $r[id]);calculate(\"header\");'>$r[text_en]</textarea>\n";
+							echo "<textarea id='text_en' onChange='updateField(\"festival\", \"text_en\", this.value, $r[id]);calculate(\"header\");'>$r[text_en]</textarea>\n";
 						?>
+						<script>
+							CKEDITOR.replace('text_en');
+						</script>
 					</div>
 					<div class='header_text'>
 						Texto euskera:
 						<?php
-							echo "<textarea onChange='updateField(\"festival\", \"text_eu\", this.value, $r[id]);calculate(\"header\");'>$r[text_eu]</textarea>\n";
+							echo "<textarea id='text_eu' onChange='updateField(\"festival\", \"text_eu\", this.value, $r[id]);calculate(\"header\");'>$r[text_eu]</textarea>\n";
 						?>
+						<script>
+							CKEDITOR.replace('text_eu');
+						</script>
 					</div>
 					<div id='header_image'>
 						Cartel:<br/>
@@ -166,7 +178,7 @@
 							<td>
 								<select id='new_event_25_host' class='new_event_host'>
 									<option value='-2' selected='selected'>SELECCIONA...</option>
-									<option value='-1' selected='selected'>A&Ntilde;ADIR NUEVO...</option>
+									<option value='-1'>A&Ntilde;ADIR NUEVO...</option>
 									<?php
 										$q = mysqli_query($con, "SELECT * FROM people;");
 										while ($r = mysqli_fetch_array($q)){
@@ -178,7 +190,7 @@
 							<td>
 								<select id='new_event_25_host' class='new_event_host'>
 									<option value='-2' selected='selected'>SELECCIONA...</option>
-									<option value='-1' selected='selected'>A&Ntilde;ADIR NUEVO...</option>
+									<option value='-1'>A&Ntilde;ADIR NUEVO...</option>
 									<?php
 										$q = mysqli_query($con, "SELECT * FROM place;");
 										while ($r = mysqli_fetch_array($q)){