Merge branch 'Internal_Blog' into Internal

www-admin/blog/add/index.php

@@ -28,34 +28,48 @@
 		<?php include('../../toolbar.php'); ?>
 		<div id='content'>
 			<div class="section">
-				<h3>Nuevo post</h3>
+				<h3 class="section_title">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">
+						<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" class="blog_add_language">
+							<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" class="blog_add_language" style="display:none;">
+							<input type="text" name="title_eu" id="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" class="blog_add_language" style="display:none;">
+							<input type="text" name="title_en" id="title_en" placeholder="Titlu"><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="images">
-						<h4>Imagenes</h4>
+						<h4>Im&aacute;genes</h4>
 						<ul>
 							<li>
 								Principal (Aparecera sobre el texto y en las previsualizaciones)<br/>
@@ -87,8 +101,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(validate_post());"/> <!--TODO-->
-						<input type="submit" value="Publicar"/>
+						<div id="add_button_container">
+							<input type="button" value="Previsualizar" onClick="alert(validate_post());"/> <!--TODO-->
+							<br/>
+							<input type="submit" value="Publicar"/>
+						</div>
 					</div>
 				</form>
 			</div>

www-admin/blog/edit/index.php

@@ -56,37 +56,51 @@
 		<?php include('../../toolbar.php'); ?>
 		<div id='content'>
 			<div class="section">
-				<h3>Editar post</h3>
+				<h3 class="section_title">Editar post</h3>
 				<form action="edit.php" maxlength="120" method="post" enctype="multipart/form-data" onsubmit="return validate_post();">
 					<?php
 						echo "<input type='hidden' name='id' value='$id'/>\n";
 					?>
-					<div class="entry blog_add_language">
-						<h4>Castellano (obligatorio)</h4>
-						<input type="text" id="title_es" name="title_es" placeholder="Titulo" value="<?php echo $title_es;?>"/><br/><br/>
-						<textarea name="text_es" id="text_es" placeholder="Texto"><?php echo $text_es;?></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" value="<?php echo $title_eu;?>"/><br/><br/>
-						<textarea name="text_eu" id="text_eu" placeholder="Texto"><?php echo $text_eu;?></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" value="<?php echo $title_en;?>"/><br><br/>
-						<textarea name="text_en" id="text_en" placeholder="Texto"><?php echo $text_en;?></textarea>
-						<script>
-							CKEDITOR.replace('text_es');
-						</script>
-					</div>
+					<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" class="blog_add_language">
+							<input type="text" id="title_es" name="title_es" placeholder="Titulo" value="<?php echo $title_es;?>"/><br/><br/>
+							<textarea name="text_es" id="text_es" placeholder="Texto"><?php echo $text_es;?></textarea>
+							<script>
+								CKEDITOR.replace('text_es');
+							</script>
+						</div>
+						<div id="content_lang_eu" class="blog_add_language" style="display:none;">
+							<input type="text" name="title_eu" id="title_eu" placeholder="Titulu" value="<?php echo $title_eu;?>"/><br/><br/>
+							<textarea name="text_eu" id="text_eu" placeholder="Textua"><?php echo $text_eu;?></textarea>
+							<script>
+								CKEDITOR.replace('text_eu');
+							</script>
+						</div>
+						<div id="content_lang_en" class="blog_add_language" style="display:none;">
+							<input type="text" name="title_en" id="title_en" placeholder="Title" value="<?php echo $title_en;?>"/><br><br/>
+							<textarea name="text_en" id="text_en" placeholder="Content"><?php echo $text_en;?></textarea>
+							<script>
+								CKEDITOR.replace('text_es');
+							</script>
+						</div>
+					</div> <!--Entry-->
 					<div class="entry" id="images">
-						<h4>Imagenes</h4>
+						<h4>Im&aacute;genes</h4>
 						<ul>
 							<li>
 								Principal (Aparecera sobre el texto y en las previsualizaciones)<br/>
@@ -95,12 +109,12 @@
 										$q_img = mysqli_query($con, "SELECT image FROM post_image WHERE post = $id AND idx = 0");
 										if (mysqli_num_rows($q_img) == 0){
 											echo "<img class='image_upload_preview' id='image_preview_0' src='/img/misc/alpha.png'/>\n";
-											echo "<input type='button' style='diplay:none;' onClick='delete_image(0, image_preview_0, this);' value='Eliminar'";
+											echo "<input type='button' style='display:none;' onClick='delete_image(0, image_preview_0, this);' value='Eliminar'";
 										}
 										else{
 											$r_img = mysqli_fetch_array($q_img);
 											echo "<img class='image_upload_preview' style='display:block;' id='image_preview_0' src='http://$default_host/img/blog/miniature/$r_img[image]'/>\n";
-											echo "<input type='button' style='diplay:block;' onClick='delete_image(0, image_preview_0, this);' value='Eliminar'";
+											echo "<input type='button' style='display:block;' onClick='delete_image(0, image_preview_0, this);' value='Eliminar'";
 										}
 									?>
 									<br/><br/>
@@ -115,12 +129,12 @@
 										$q_img = mysqli_query($con, "SELECT image FROM post_image WHERE post = $id AND idx = 1");
 										if (mysqli_num_rows($q_img) == 0){
 											echo "<img class='image_upload_preview' id='image_preview_1' src='/img/misc/alpha.png'/>\n";
-											echo "<input type='button' style='diplay:none;' onClick='delete_image(1, image_preview_1, this);' value='Eliminar'";
+											echo "<input type='button' style='display:none;' onClick='delete_image(1, image_preview_1, this);' value='Eliminar'";
 										}
 										else{
 											$r_img = mysqli_fetch_array($q_img);
 											echo "<img class='image_upload_preview' style='display:block;' id='image_preview_1' src='http://$default_host/img/blog/miniature/$r_img[image]'/>\n";
-											echo "<input type='button' style='diplay:block;' onClick='delete_image(1, image_preview_1, this);' value='Eliminar'";
+											echo "<input type='button' style='display:block;' onClick='delete_image(1, image_preview_1, this);' value='Eliminar'";
 										}
 									?>
 									<br/><br/>
@@ -132,12 +146,12 @@
 										$q_img = mysqli_query($con, "SELECT image FROM post_image WHERE post = $id AND idx = 2");
 										if (mysqli_num_rows($q_img) == 0){
 											echo "<img class='image_upload_preview' id='image_preview_2' src='/img/misc/alpha.png'/>\n";
-											echo "<input type='button' style='diplay:none;' onClick='delete_image(2, image_preview_2, this);' value='Eliminar'";
+											echo "<input type='button' style='display:none;' onClick='delete_image(2, image_preview_2, this);' value='Eliminar'";
 										}
 										else{
 											$r_img = mysqli_fetch_array($q_img);
 											echo "<img class='image_upload_preview' style='display:block;' id='image_preview_2' src='http://$default_host/img/blog/miniature/$r_img[image]'/>\n";
-											echo "<input type='button' style='diplay:block;' onClick='delete_image(2, image_preview_2, this);' value='Eliminar'";
+											echo "<input type='button' style='display:block;' onClick='delete_image(2, image_preview_2, this);' value='Eliminar'";
 										}
 									?>
 									<br/><br/>
@@ -149,12 +163,12 @@
 										$q_img = mysqli_query($con, "SELECT image FROM post_image WHERE post = $id AND idx = 3");
 										if (mysqli_num_rows($q_img) == 0){
 											echo "<img class='image_upload_preview' id='image_preview_3' src='/img/misc/alpha.png'/>\n";
-											echo "<input type='button' style='diplay:none;' onClick='delete_image(3, image_preview_3, this);' value='Eliminar'";
+											echo "<input type='button' style='display:none;' onClick='delete_image(3, image_preview_3, this);' value='Eliminar'";
 										}
 										else{
 											$r_img = mysqli_fetch_array($q_img);
 											echo "<img class='image_upload_preview' style='display:block;' id='image_preview_3' src='http://$default_host/img/blog/miniature/$r_img[image]'/>\n";
-											echo "<input type='button' style='diplay:block;' onClick='delete_image(3, image_preview_3, this);' value='Eliminar'";
+											echo "<input type='button' style='display:block;' onClick='delete_image(3, image_preview_3, this);' value='Eliminar'";
 										}
 									?>
 									<br/><br/>
@@ -169,8 +183,11 @@
 						<label><input type="checkbox" name="visible" <?php if ($r['visible'] == 1) echo 'checked'; ?>/>Post visible</label><br/><br/>
 						<label><input type="checkbox" name="comments" <?php if ($r['comments'] == 1) echo 'checked'; ?>/>Permitir comentarios</label><br/><br/>
 						<br/><br/><br/><br/>
-						<input type="button" value="Previsualizar" onClick="alert(validate_post());"/> <!--TODO-->
-						<input type="submit" value="Publicar"/>
+						<div id="add_button_container">
+							<input type="button" value="Previsualizar" onClick="alert(validate_post());"/> <!--TODO-->
+							<br/>
+							<input type="submit" value="Publicar"/>
+						</div>
 					</div>
 				</form>
 			</div>

www-admin/blog/index.php

@@ -28,7 +28,7 @@
 		<?php include('../toolbar.php'); ?>
 		<div id='content'>
 			<div class="section">
-				<h3>Entradas del blog - <a href="/blog/add/">Anadir nueva</a></h3>
+				<h3 class="section_title">Entradas del blog - <a href="/blog/add/">A&ntilde;adir nueva</a></h3>
 				<div class="entry">
 					<table id='blog_post_list'>
 						<tr>
@@ -39,9 +39,10 @@
 							<th>Accion</th>
 						</tr>
 						<?php
-							$query = mysqli_query($con, "SELECT id, title_es, title_eu, title_en, text_es, text_eu, text_en, user, visible, comments, DATE_FORMAT(dtime, '%b %d, %Y %H:%i:%s') AS ptime FROM post ORDER BY id DESC;");
+							$query = mysqli_query($con, "SELECT id, title_es, title_eu, title_en, text_es, text_eu, text_en, user, visible, comments, DATE_FORMAT(dtime, '%b %d, %Y %H:%i:%s') AS ptime, permalink FROM post ORDER BY id DESC;");
 							while ($r = mysqli_fetch_array($query)){
-								echo "<tr>\n<td class='blog_column_title'>" . cutText($r['title_es'], 35, '', '') . "</td>\n<td class='blog_column_text'>" . cutText($r['text_es'], 80, '', '') . "\n";
+								echo "<tr>\n<td class='blog_column_title'><a href='https://margolariak.com/blog/$r[permalink]'>" . cutText($r['title_es'], 35, '', '') . "</a></td>";
+								echo "<td class='blog_column_text'>" . str_replace('<br/>', ' ', cutText($r['text_es'], 60, '', '')) . "\n";
 								
 								$q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r[id] ORDER BY idx;");
 								if (mysqli_num_rows($q_image) > 0){
@@ -90,9 +91,8 @@
 								echo "Ingl&eacute;s: " . intval($translated_en * 100 / $total) . "%<br/>Euskera: " . intval($translated_eu * 100 / $total) . "%\n";
 								
 								
-								echo "\n</td>\n<td class='blog_column_action'>\n<form method='get' action='http://$http_host/blog/edit/index.php'>\n<input type='submit' value='Editar'/>\n<input type='hidden' name='p' value='$r[id]'/></form>\n";
+								echo "\n</td>\n<td class='blog_column_action'>\n<form method='get' action='http://$http_host/blog/edit/index.php'>\n<input type='submit' value='Editar / Trducir'/>\n<input type='hidden' name='p' value='$r[id]'/></form>\n";
 								echo "<input type='button' onClick='delete_post($r[id], \"$r[title_es]\");' value='Borrar'/>";
-								echo "<form action='/blog/translate/translate.php'>\n<input type='hidden' name='id' value='$r[id]'/><input type='submit' value='Traducir'/>\n</form>";
 								echo "<form action='/blog/moderate/moderate.php?p=$r[id]'>\n<input type='submit' value='Moderar comentarios'/>\n</form>";
 								echo "</td>\n</tr>";
 							}

www-admin/blog/moderate/index.php

@@ -12,7 +12,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"/>
@@ -24,5 +24,12 @@
 		<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/blog.css

@@ -1,27 +1,11 @@
 /* /blog/add/index.php */
 
-div.blog_add_language{
-	width:			31%;
-	display:		inline-block;
-	vertical-align:	top;
-}
-
-div#images{
-	display:		inline-block;
-	vertical-align:	top;
-	width:			60%;
-}
-
-div#settings{
-	display:		inline-block;
-	vertical-align:	top;
-	width:			35%;
-}
-
+/* Post title */
 input[type=text]{
 	width:	100%;
 }
 
+/* Post text */ 
 textarea{
 	width:	100%;
 	height:	20em;
@@ -41,10 +25,22 @@ img.image_upload_preview{
 	height:		5em;
 }
 
-/* /blog/inex.php */
+/* Buttons */
+div#add_button_container{
+	text-align:	center;
+}
+
+div#add_button_container input{
+	width:	30%;
+	margin:	0.5em auto 0.5em auto;	
+}
+
+
+/* /blog/index.php */
 
 table#blog_post_list{
-	border-collapse: collapse;
+	border-collapse:	collapse;
+	margin:			0.5em;
 }
 
 table#blog_post_list td, th{
@@ -53,7 +49,7 @@ table#blog_post_list td, th{
 }
 
 table#blog_post_list th{
-	background-color:	#999999;
+	background-color:	#66aaff;
 }
 
 table#blog_post_list td.blog_column_title{
@@ -65,13 +61,14 @@ table#blog_post_list td.blog_column_text{
 }
 
 table#blog_post_list td.blog_column_text img{
-	max-width:	6em;
-	max-height:	4em;
+	max-width:	5em;
+	max-height:	2em;
 	border:		0.1em solid black;
-	margin:		0.1em;
+	margin:		0.05em;
 }
 
 table#blog_post_list td.blog_column_details{
+	font-size:	80%;
 	width:		10%;
 	text-align:	center;
 }
@@ -86,6 +83,13 @@ table#blog_post_list td.blog_column_action{
 	text-align:	center;
 }
 
+table#blog_post_list td.blog_column_action input{
+        margin: 	0.05em;
+	padding:	0.06em;
+	font-size:	70%
+}
+
+
 table#blog_post_list form{
 	margin:	0;
 }

www-admin/css/ui.css

@@ -70,7 +70,7 @@ input[type="text"], input[type="number"], input[type="date"]{
 	margin:				0.1em;
 }
 
-input[type="button"], input[type="submit"], select{
+input[type="button"], input[type="submit"], input[type="password"], input[type="file"], select{
 	border-radius:		0.3em;
 	height:				2em;
 	border:				0.2em solid #0078ff;
@@ -289,3 +289,30 @@ table.translation_table th{
 table.translation_table td{
 	border:	1px solid #000000;
 }
+
+
+/******************************************
+* Language selectors                      *
+******************************************/
+
+div#lang_tabs{
+	margin-top:	2em;
+	margin-bottom:	2em;
+}
+
+div#lang_tabs table{
+	width:	100%;
+}
+
+div#lang_tabs td{
+	color:		#555555;
+	font-weight:	bold;
+	width:		33%;
+	border:		0.1em solid black;
+	margin:		0;
+}
+
+div#lang_tabs td.lang_tabs_active{
+	color:		#0078ff;
+	border-bottom:	0.1em solid #ffffff;
+}

www-admin/main.php

@@ -35,8 +35,6 @@
 								<ul>
 									<li><a href='/blog/add/'>Nuevo post</a></li>
 									<li><a href='/blog/'>Gestionar posts</a></li>
-									<li><a href='/blog/moderate/'>Moderar comentarios</a></li>
-									<li><a href='/blog/translate/'>Traducir posts</a></li>
 								</ul>
 							</div>
 						</div>

www-admin/script/ui.js

@@ -14,4 +14,34 @@ function showToolbar(toolbar, from){
 		document.getElementById('toolbar_' + toolbar).style.display = 'block';
 		from.style.backgroundColor = '#333333';
 	}
-}
+}
+
+
+function showLanguage(lang){
+	switch (lang){
+		case 'es':
+			document.getElementById('content_lang_es').style.display = 'block';
+			document.getElementById('content_lang_eu').style.display = 'none';
+			document.getElementById('content_lang_en').style.display = 'none';
+			document.getElementById('lang_tab_es').classList.add("lang_tabs_active");
+			document.getElementById('lang_tab_eu').classList.remove("lang_tabs_active");
+			document.getElementById('lang_tab_en').classList.remove("lang_tabs_active");
+			break;
+		case 'eu':
+                        document.getElementById('content_lang_es').style.display = 'none';
+                        document.getElementById('content_lang_eu').style.display = 'block';
+                        document.getElementById('content_lang_en').style.display = 'none';
+                        document.getElementById('lang_tab_es').classList.remove("lang_tabs_active");
+                        document.getElementById('lang_tab_eu').classList.add("lang_tabs_active");
+                        document.getElementById('lang_tab_en').classList.remove("lang_tabs_active");
+                        break;
+		case 'en':
+                        document.getElementById('content_lang_es').style.display = 'none';
+                        document.getElementById('content_lang_eu').style.display = 'none';
+                        document.getElementById('content_lang_en').style.display = 'block';
+                        document.getElementById('lang_tab_es').classList.remove("lang_tabs_active");
+                        document.getElementById('lang_tab_eu').classList.remove("lang_tabs_active");
+                        document.getElementById('lang_tab_en').classList.add("lang_tabs_active");
+	}
+}
+

www-admin/toolbar.php

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