Ver código fonte

Merge branch 'newui'

seavenois 9 anos atrás
pai
commit
54a3ee0a98

+ 4 - 4
www/actividades/index.php

@@ -84,7 +84,7 @@
 					echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 					echo "</div>\n";
 					echo "<div id='upcoming_text'>\n";
-					echo "<h3><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a><span class='title_date'> - " . formatDate($r_activity['date'], $lang, false) . "</span></h3>\n";
+					echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a><span class='title_date'> - " . formatDate($r_activity['date'], $lang, false) . "</span></h3>\n";
 					//Table with details
 					echo "<table class='future_details'><tr>\n";
 					//If image, show it
@@ -126,7 +126,7 @@
 				echo "</div>\n";
 			}
 			else{ //No upcoming activities
-				echo("<div class='entry'>\n$lng[activities_no_upcoming]\n</div>\n");
+				echo("<div class='entry'><h3 class='entry_title'>\n$lng[activities_no_upcoming]\n</h3></div>\n");
 			}
 			echo "</div>\n";
 				
@@ -146,11 +146,11 @@
 					echo "<div class='entry past_activity'>\n";
 					$q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_past[id] ORDER BY idx LIMIT 1;");
 					if ($i == 0 && mysqli_num_rows($q_upcoming) == 0){
-						echo "<h3><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-down.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
+						echo "<h3 class='entry_title'><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-down.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
 						echo "<div class='past_activity_details past_activity_details_first' id='past_activity_details_$r_past[id]'>\n";
 					}
 					else{
-						echo "<h3><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-right.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
+						echo "<h3 class='entry_title'><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-right.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
 						echo "<div class='past_activity_details' id='past_activity_details_$r_past[id]'>\n";
 					}
 					$i ++;

+ 1 - 1
www/ayuda/index.php

@@ -123,7 +123,7 @@
 			<div class="content_row">
 				<div class="content_cell">
 					<div class="section" id="section_privacy">
-						<h3><?php echo $lng['help_privacy_title']; ?></h3>
+						<h3 class="section_title"><?php echo $lng['help_privacy_title']; ?></h3>
 						<div class="entry">
 							<?php echo $lng['help_privacy']; ?>
 						</div>

+ 1 - 1
www/blog/buscar.php

@@ -116,7 +116,7 @@
 							echo "<meta itemprop='telephone' content='+34637140371'/>\n";
 							echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 							echo "</div>\n";
-							echo "<h2 class='post_search_title'><a itemprop='url' href='$proto$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
+							echo "<h3 class='entry_title post_search_title'><a itemprop='url' href='$proto$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
 							# Tags (if any) and date
 							echo "<table class='post_footer post_footer_search'><tr>\n";
 							$q_tag = mysqli_query($con, "SELECT tag FROM post_tag WHERE post= $r[id];");

+ 1 - 1
www/blog/index.php

@@ -83,7 +83,7 @@
 						echo "<meta itemprop='telephone' content='+34637140371'/>\n";
 						echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 						echo "</div>\n";
-						echo "<h2><a itemprop='url' href='$proto$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
+						echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
 						$q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r[id] ORDER BY idx LIMIT 1;");
 						if (mysqli_num_rows($q_image) > 0){
 							$r_image = mysqli_fetch_array($q_image);

+ 1 - 1
www/blog/post.php

@@ -108,7 +108,7 @@
 					echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 					echo "</div>\n";
 					echo "<div class='entry'>\n";
-					echo "<h2>$r[title]</h2>\n";
+					echo "<h3 class='entry_title'>$r[title]</h3>\n";
 					if ($r_image != null){
 						echo "<div class='image_container'>\n";
 						echo "<meta itemprop='image' content='$proto$http_host/img/blog/$r_image[image]'/>\n";

+ 11 - 0
www/css/ui.css

@@ -430,6 +430,17 @@ div.section a.go_to_section{
 	transition:			all .3s ease-in-out;
 }
 
+h3.entry_title{
+	color: 		#275573;
+	font-weight:	bold;
+	font-size:	1.3em;
+	margin:		1em 1em 0.3em 0em;
+}
+
+h3.entry_title a{
+	color: 		#275573;
+}
+
 /* Comments */
 div.comment{
 	margin:	0.5em 1em 0.5em 1em;

+ 1 - 1
www/galeria/album.php

@@ -90,7 +90,7 @@
 						echo "<div class='entry photo'>\n<div class='photo_container'>\n";
 						echo "<img class='pointer photo_img' path='$r_photo[file]' onClick=\"showPhotoByPath('$r_photo[file]');\" src='/img/galeria/miniature/$r_photo[file]' /></div>\n";
 						if (strlen($r_photo['title']) > 0 ){
-							echo "<h4><a href='javascript:;' onClick=\"showPhotoByPath('$r_photo[file]');\">$r_photo[title]</a></h4>\n";
+							echo "<h3 class='entry_title'><a href='javascript:;' onClick=\"showPhotoByPath('$r_photo[file]');\">$r_photo[title]</a></h4>\n";
 						}
 						if (strlen($r_photo['description']) > 0 ){
 							echo "<span class='photo_description'>" . cutText($r_photo['description'], 50) . "</span>\n";

+ 8 - 4
www/galeria/index.php

@@ -86,10 +86,14 @@
 							}
 							echo "</tr>\n</table>\n";
 							$q_count = mysqli_query($con, "SELECT album FROM photo_album WHERE album = $r[id];");
-							if (mysqli_num_rows($q_count) == 1)
-								echo "<h4><a href='$proto$http_host/galeria/$r[permalink]'>$r[title]</a> - 1 $lng[gallery_photos_singular]</h4>\n";
-							else
-								echo "<h4><a href='$proto$http_host/galeria/$r[permalink]'>$r[title]</a> - " . mysqli_num_rows($q_count) . " $lng[gallery_photos_plural]</h4>\n";
+							if (mysqli_num_rows($q_count) == 1){
+								echo "<h3 class='entry_title'><a href='$proto$http_host/galeria/$r[permalink]'>$r[title]</a></h3>\n";
+								echo("1 $lng[gallery_photos_singular]");
+							}
+							else{
+								echo "<h3 class='entry_title'><a href='$proto$http_host/galeria/$r[permalink]'>$r[title]</a></h3>\n";
+								echo(mysqli_num_rows($q_count) . " $lng[gallery_photos_plural]");
+							}
 							if (strlen($r['description']) > 0){
 								echo "<p>". cutText($r['description'], 100, "$lng[gallery_read_more]", "$proto$http_host/galeria/$r[permalink]") . "</p>\n";
 							}

+ 4 - 4
www/galeria/load_photo.php

@@ -30,7 +30,7 @@
 		echo "<div id='photo_viewer_details'>\n";
 		echo "<div class='entry' id='photo_data'>\n";
 		if (strlen($r['title']) > 0){
-			echo "<h4>$r[title]</h4>\n";
+			echo "<h3 class='entry_title'>$r[title]</h3>\n";
 		}
 		if (strlen($r['description']) > 0){
 			echo "<span id='photo_description'>$r[description]</span>\n";
@@ -46,13 +46,13 @@
 		echo "<div id='photo_viewer_comment_counter'>\n";
 		switch ($comment_count){
 			case 0:
-				echo "<h4><meta itemprop='interactionCount' content='0'/>$lng[gallery_comment_count_0]</h4>\n";
+				echo "<h3 class='entry_title'><meta itemprop='interactionCount' content='0'/>$lng[gallery_comment_count_0]</h3>\n";
 				break;
 			case 1:
-				echo "<h4><span itemprop='interactionCount'>1</span> $lng[gallery_comment_count_1]</h4>\n";
+				echo "<h3 class='entry_title'><span itemprop='interactionCount'>1</span> $lng[gallery_comment_count_1]</h3>\n";
 				break;
 			default:
-				echo "<h4><span itemprop='interactionCount'>$comment_count</span> $lng[gallery_comment_count_several]</h4>\n";
+				echo "<h3 class='entry_title'><span itemprop='interactionCount'>$comment_count</span> $lng[gallery_comment_count_several]</h3>\n";
 		}
 		echo "</div>\n";
 		echo "<div id='comment_list'>\n";

+ 8 - 8
www/index.php

@@ -88,7 +88,7 @@
 							echo "<img id='festivals_image' alt=' ' src='$proto$http_host/img/fiestas/$r_festivals[img]'/>\n";
 						}
 						if ($r_festivals['summary'] != ''){
-							echo "<span id='festivals_summary_text'><br/>$r_festivals[summary]</span>\n";
+							echo "<span class='entry_title' id='festivals_summary_text'><br/>$r_festivals[summary]</span>\n";
 							echo "<br/><br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='$proto$http_host/lablanca/'>$lng[index_festivals_link]</a>\n";
 						}
 						else{
@@ -104,7 +104,7 @@
 					if (mysqli_num_rows($q_location) > 0){
 						$r_location = mysqli_fetch_array($q_location);
 						echo "<td><div class='entry' id='festival_entry_map'>\n";
-						echo "<h3>$lng[index_festivals_location]</h3>\n";
+						echo "<h3 class='entry_title'>$lng[index_festivals_location]</h3>\n";
 						echo "<iframe src='https://www.google.com/maps/embed/v1/place?key=AIzaSyCZHP7t2on_G3eyyoCTfhGAlDx1mJnX7iI&q=$r_location[lat],$r_location[lon]' allowfullscreen></iframe>\n";
 						echo "</div>\n";
 					}
@@ -117,7 +117,7 @@
 					$q_sch_next = mysqli_query($con, "SELECT festival_event.id AS id, gm, title_$lang AS title, description_$lang AS description, host, place, date_format(start, '%H:%i') AS st, date_format(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%dT%H:%i:00') AS isostart, DATE_FORMAT(end, '%Y-%m-%dT%H:%i:00') AS isoend, place.name_$lang AS place, address_$lang AS address, lat, lon FROM festival_event, place WHERE place.id = festival_event.place AND gm = 1 AND start > NOW() AND start < NOW() + INTERVAL 240 MINUTE ORDER BY start LIMIT 1;");
 					if (mysqli_num_rows($q_sch_curr) > 0 || mysqli_num_rows($q_sch_next) > 0){
 						echo "<td><div class='entry festival_schedule'>\n";
-						echo "<h3>$lng[index_festivals_gm_schedule]</h3>\n";
+						echo "<h3 class='entry_title'>$lng[index_festivals_gm_schedule]</h3>\n";
 					
 						if (mysqli_num_rows($q_sch_curr) > 0){
 							$r_sch_curr = mysqli_fetch_array($q_sch_curr);
@@ -180,7 +180,7 @@
 					$q_sch_next = mysqli_query($con, "SELECT festival_event.id AS id, gm, title_$lang AS title, description_$lang AS description, host, place, date_format(start, '%H:%i') AS st, date_format(end, '%H:%i') AS end, DATE_FORMAT(start, '%Y-%m-%dT%H:%i:00') AS isostart, DATE_FORMAT(end, '%Y-%m-%dT%H:%i:00') AS isoend, place.name_$lang AS place, address_$lang AS address, lat, lon FROM festival_event, place WHERE place.id = festival_event.place AND gm = 0 AND start > NOW() AND start < NOW() + INTERVAL 240 MINUTE ORDER BY start LIMIT 1;");
 					if (mysqli_num_rows($q_sch_curr) > 0 || mysqli_num_rows($q_sch_next) > 0){
 						echo "<td><div class='entry festival_schedule' >\n";
-						echo "<h3>$lng[index_festivals_city_schedule]</h3>\n";
+						echo "<h3 class='entry_title'>$lng[index_festivals_city_schedule]</h3>\n";
 					
 						if (mysqli_num_rows($q_sch_curr) > 0){
 							$r_sch_curr = mysqli_fetch_array($q_sch_curr);
@@ -278,7 +278,7 @@
 						echo "</div></div>\n";
 					}
 					echo "<div class='td'><div id='upcoming_text'>\n";
-					echo "<h3><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
+					echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
 					echo "<p>". cutText($r_activity['text'], 250, "$lng[index_read_more]", "$http_host/actividades/$r_activity[permalink]") . "</p>\n";
 					echo "</div></div>\n";
 					echo "<div class='td'><div id='upcoming_details'>\n";
@@ -323,7 +323,7 @@
 								echo "<h3 class='section_title'>$lng[index_latest_posts]</h3>\n";
 								$q_post = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, dtime, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate FROM post WHERE visible = 1 ORDER BY dtime DESC LIMIT 2;");
 								if (mysqli_num_rows($q_post) == 0){
-									echo "<div class='entry'>$lng[index_no_post]</div>\n";
+									echo "<div class='entry'><h3 class='entry_title'>$lng[index_no_post]</div>\n";
 								}
 								else{
 									while ($r_post = mysqli_fetch_array($q_post)){
@@ -347,7 +347,7 @@
 											echo "<meta itemprop='image' content='$proto$http_host/img/blog/preview/$r_post_image[image]'/>\n";
 											echo "<a href='$proto$http_host/blog/$r_post[permalink]'><img src='$proto$http_host/img/blog/miniature/$r_post_image[image]'/></a>\n";
 										}
-										echo "<h3><a itemprop='url' href='$proto$http_host/blog/$r_post[permalink]'>$r_post[title]</a></h3>\n";
+										echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/blog/$r_post[permalink]'>$r_post[title]</a></h3>\n";
 										echo "<p>". cutText($r_post['text'], 100, "$lng[index_read_more]", "$proto$http_host/blog/$r_post[permalink]") . "</p>\n";
 										echo "<span>" . formatDate($r_post['dtime'], $lang, false) . "</span>\n";
 										echo "</div>\n";
@@ -414,7 +414,7 @@
 							echo "<meta itemprop='telephone' content='+34637140371'/>\n";
 							echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 							echo "</div>\n";
-							echo "<h3><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
+							echo "<h3 class='entry_title'><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
 							echo "<table class='latest_activity'><tr>\n";
 							$q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_activity[id] ORDER BY idx LIMIT 1;");
 							if (mysqli_num_rows($q_activity_image) > 0){

+ 1 - 1
www/lablanca/fiestas.php

@@ -1,5 +1,5 @@
 <div class='section'>
-	<h3><?php echo str_replace('#', $year, $lng['lablanca_title']);?></h3>
+	<h3 class='section_title'><?php echo str_replace('#', $year, $lng['lablanca_title']);?></h3>
 	<div class='entry'>
 	<?php
 		//Some text for the festivals

+ 1 - 1
www/lablanca/nofiestas.php

@@ -1,6 +1,6 @@
 <?php //TODO: Revisit this file.?>
 <div class="section">
-	<h3><?php echo($lng['lablanca_no_intro']); ?></h3>
+	<h3 class="section_title"><?php echo($lng['lablanca_no_intro']); ?></h3>
 	<div class="entry">
 		<div class="horiz">
 			<p><?php echo($lng['lablanca_no_content']); ?></p>