Merge remote-tracking branch 'refs/remotes/evacchi/master'

fp-includes/core/core.system.php

@@ -73,7 +73,7 @@
 
 
 	
-	define('SYSTEM_VER', '1.0.2');
+	define('SYSTEM_VER', '1.0.3');
 	function system_ver() {
 		return 'fp-' . SYSTEM_VER;
 	}

fp-includes/smarty/plugins/function.list_categories.php

@@ -30,7 +30,9 @@ function smarty_function_list_categories($params) //, &$smarty)
 	
 	if (file_exists(CONTENT_DIR . 'categories.txt')) {
 		$cats = trim(io_load_file(CONTENT_DIR . 'categories.txt'));
-		return '<ul>'.do_print_categories_list(explode("\n", $cats), $stack=array(0), $arr=array(), $cat_params).'</ul>';
+		$stack=array(0);
+		$arr=array();
+		return '<ul>'.do_print_categories_list(explode("\n", $cats), $stack, $arr, $cat_params).'</ul>';
 	} else {
 		global $lang;
 			
@@ -152,70 +154,3 @@ function do_print_categories_list(&$lines, &$indentstack, &$result, $params) {
         return implode($result);
 
 }
-
-/*
-function print_list_categories(&$lines, &$indentstack, $result, $params) {
-
-	global $fpdb;
-	
-
-	if (empty($lines))
-		return '';
-	
-	$str = '';
-	$v = reset($lines);
-	$vt = ltrim($v);
-	
-	$indent = strlen($v) - strlen($vt);
-	$indent_old = end($indentstack);
-	
-	extract($params);
-	
-	if ($indent > $indent_old) {
-		array_push($indentstack, $indent);
-		array_pop($result);
-		array_push($result, $old);
-		array_push($result, $ild);
-		array_push($result, $vt);
-		print_list_categories($lines, $indentstack, $result, $params);
-	}elseif($indent < $indent_old) {
-		array_pop($indentstack);
-		array_push($result, $ord);
-		print_list_categories($lines, $indentstack, $result, $params);	
-	}else{
-
-		
-		array_push($result, $ild);
-		
-		/*if (isset($after)) {
-			eval('$the_after = "'.$after.'";');	
-		} else {
-			$the_after = "<label><input name=\"cats[{$catId}]\" ";
-			if ((bool)array_intersect(array($catId),$cats)) {
-				$the_after .='checked="checked" ';
-			}
-			$the_after.='type="checkbox" />';
-		}
-		
-			//array_push($result, $the_after);
-			
-			array_push($result, $vt);
-			
-		/*if (isset($before)) {
-			eval('$the_before = "'.$before.'";');
-			
-		}else{
-			$the_before='</label>';
-		}
-		//array_push($result, $the_before);
-		
-		array_push($result, $ird);
-		array_shift($lines);
-		print_list_categories($lines, $indentstack, $result, $params);
-	}
-	
-	return implode($result);	
-}
-*/
-
-?> 

fp-interface/sharedtpls/comment-form.tpl

@@ -33,6 +33,7 @@
 		<label class="textlabel" for="url">{$lang.comments.www}</label>
 		</p>
 		
+		{* do action *}
 		{comment_form}
 		
 	</div>
@@ -42,7 +43,7 @@
 	
 	<div class="comment-content">
 			<p><textarea name="content" {$error.content|notempty:'class="field-error"'}
-			id="content" rows="10" cols="74">{$values.content}</textarea></p>
+			id="content" rows="10" cols="74">{$values.content|wp_specialchars:1}</textarea></p>
 			{*here will go a plugin hook*}
 	</div>
 	

fp-interface/themes/leggero/entry-default.tpl

@@ -1,26 +1,29 @@
-	<div id="{$id}" class="entry {$date|date_format:"y-%Y m-%m d-%d"}">
+	<div itemscope itemtype="http://schema.org/BlogPosting" id="{$id}" class="entry {$date|date_format:"y-%Y m-%m d-%d"}">
 				{* 	using the following way to print the date, if more 	*} 
 				{*	than one entry have been written the same day,		*} 
 				{*	 the date will be printed only once 				*}
 				
 		{$date|date_format_daily:"<h2 class=\"date\">`$fp_config.locale.dateformat`</h2>"}
 		
-				<h3>
+				<h3 itemprop="name">
 				<a href="{$id|link:post_link}">
 				{$subject|tag:the_title}
 				</a>
 				</h3>
 				{include file=shared:entryadminctrls.tpl}
 				
-				
+				<span itemprop="articleBody">
 				{$content|tag:the_content}
-			
+				</span>
 				
 				<ul class="entry-footer">
 			
-				<li class="entry-info">Posted by {$author} at
+				<li class="entry-info">Posted by <span itemprop="author">{$author}</span> at
 				{$date|date_format}
+
+				<span itemprop="articleSection">
 				{if ($categories)} in {$categories|@filed}{/if}
+				</span>
 				</li> 
 				
 				{if !(in_array('commslock', $categories) && !$comments)}

fp-interface/themes/leggero/footer.tpl

@@ -18,7 +18,7 @@
 			-->
 			
 			<p>
-			This blog is powered by <a href="http://www.flatpress.org/">FlatPress</a>.
+			This blog is proudly powered by <a href="http://www.flatpress.org/">FlatPress</a>.
 			</p>
 		</div> <!-- end of #footer -->
 

fp-interface/themes/leggero/header.tpl

@@ -3,6 +3,8 @@
 <head>
 	<title>{$flatpress.title|tag:wp_title:'&laquo;'}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset={$flatpress.charset}" />
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700' rel='stylesheet' type='text/css'/>
 	{action hook=wp_head}
 </head>
 

fp-interface/themes/leggero/leggero-v2/res/column.css

@@ -0,0 +1,62 @@
+/*
+===================
+Leggero CSS Styles
+===================
+
+Name: Leggero v2
+Author: NoWhereMan, drudo & Marc Thibeault
+Version: 0.1
+Module: style.css
+*/
+
+/* ===== NORMAL DESIGN ===== */
+@media (min-width: 720px) {
+	/* ===== COLUMN ===== */
+	#column {
+		width: 22%;
+		display: inline-block;
+		font-size: 90%;
+		height:1%;
+		margin-bottom: 5px;
+		color: white;
+	}
+}
+
+/* ===== RESPONSIVE DESIGN ===== */
+@media (max-width: 719px) {
+	/* ===== COLUMN ===== */
+	#column {
+		text-align: center;
+		float: center;
+		width: 100%;
+		display: inline-block;
+		font-size: 100%;
+		height:1%;
+		margin: 5px auto;
+		color: white;
+	}
+}
+
+#column h4 {
+	/* Titles of the sections */
+	margin-bottom: .5em;
+	color: white;
+}
+
+#column p, #column div { margin: 5px 0px }
+
+
+
+/* === List === */
+#column ul li table { font-size: 100% }
+
+#column ul {
+	list-style-type: none;
+	margin-right: 10px;
+	margin-bottom: .5em;
+	padding-left: 1em
+}
+
+#column fieldset { margin: 0 5px 0 5px }
+
+#column legend { font-size: 100% }

fp-interface/themes/leggero/leggero-v2/res/common.css

@@ -0,0 +1,366 @@
+/*
+===================
+Leggero CSS Styles
+===================
+
+Name: Leggero v2
+Author: NoWhereMan, drudo & Marc Thibeault
+Version: 0.1
+Module: common.css
+*/
+
+/* ===== GENERAL (redefinition HTML tag) ===== */
+html {
+	font-size: 100%;
+	margin: 0;
+	padding: 0
+}
+
+body {
+	font-size: 100%;
+	color: black;
+	padding: 0;
+	text-align:center;
+	background: url('../imgs/back.jpg') no-repeat fixed top center;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+  	-o-background-size: cover;
+  	background-size: cover;
+}
+
+hr { display: none }
+
+p { margin: .5em 0 }
+
+img { border: none }
+
+blockquote {
+	width: 80%;
+	font-style: italic;
+	color: #444;
+	background-color: #ddd;
+	margin: 1em 1em;
+	padding: 0 10px;
+	border-left: 5px solid #888;
+	border-right: 1px solid #888;
+	border-top: 1px solid #888;
+	border-bottom: 1px solid #888;
+}
+
+pre, code {
+	font-family: Lucida Console, Monaco, monospace !IMPORTANT;
+	font-size: 90%;
+}
+
+pre {
+	border: 1px dashed #555;
+	background-color: #efefef;
+
+	overflow: auto;
+	width: 90%;
+	margin: 1em 1em;
+	padding: 5px 10px;
+	
+	/* fix overflow in IE */
+	min-height: 40px; 
+	height: auto !important; 
+	height: 40px; 
+}
+
+ul, li, ol { margin: 0; padding: 0 }
+
+/* === Form === */
+form { margin: 1em 0 }
+
+fieldset {
+	margin: 0 0 1em 0;
+	padding: .5em;
+	border: #ddd solid 1px
+}
+
+legend {
+	color: #666666;
+	font-size: 80%;
+	font-style: oblique
+}
+
+input, textarea, select {
+	padding: .2em;
+	border: 1px solid #999;
+	color: #222;
+	background-color: #eee;
+}
+
+input:hover, input:focus, textarea:hover, textarea:focus {
+	border: 1px solid #AA1111;
+	background-color: #fff
+}
+
+textarea {
+	font-size: 100%;
+	width: 99%;
+	margin-top: .1em;
+	margin-bottom: 1em
+}
+
+
+
+/* ===== LINKS GENERAL ===== */
+a:link, a:visited {
+	color: #B83C32;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+/* ===== HEADERS TAGS ===== */
+h1 {
+	/* Title of the blog */
+	font-size: 2.3em;
+	letter-spacing: 2px;
+	margin: 1em 0 0.5em 0;
+}
+
+h2 { } /* see h2.date */
+
+h3 {
+	/* Titles of the entry */
+	font-style: normal;
+	font-size: 1.6em;
+	margin: 0
+}
+
+h4 { font-size: 1.2em; }
+
+/* ===== HEAD ===== */
+#head {
+	padding: 25px 25px 25px 25px;
+	margin: 5px;
+	background: rgba(184,60,50,0.7);
+	border: black 1px solid;
+	border-radius: 10px ;
+}
+
+#head a { color: white; text-decoration: none }
+
+	.subtitle {
+		font-size: 100%;
+		font-style: oblique;
+		color: white;
+		margin: .5em 0 0 0
+	}
+
+/* ===== DIV CONTAINER "MAIN" ===== */
+#outer-container {
+	position: relative;
+	height: 1%;
+	margin: 0px;
+	padding: 0px;
+}
+
+/* ===== NORMAL DESIGN ===== */
+@media (min-width: 720px) {
+
+	body { margin: 10px 0 10px 0 }
+
+	/* ===== BODY CONTAINER ===== */
+	#body-container {
+		text-align: left;
+		max-width: 1000px;
+		width: 100%;
+		margin: 0 auto 0 auto;
+		padding: 5px;
+		background-color: rgba(0,0,0,0.75);
+		border-radius: 3px;
+	}
+
+	/* ===== MAIN ===== */
+	#main h4 { margin: 2em 0 0 0}
+
+	#main {
+		float:left;
+		position: relative;
+		width: 65%;
+		font-size: 100%;
+		padding: 25px;
+		margin: 20px;
+		background-color: rgba(255,255,255,0.9);
+		border-radius: 3px;
+	}
+}
+
+/* ===== RESPONSIVE DESIGN ===== */
+@media (max-width: 719px) {
+
+	body { margin: 0 0 0 0 }
+
+	/* ===== BODY CONTAINER ===== */
+	#body-container {
+		text-align: left;
+		width: 100%;
+		margin: 0 auto 0 auto;
+		padding-top: 5px;
+		background-color: rgba(0,0,0,0.75);
+	}
+
+	/* ===== MAIN ===== */
+	#main h4 { margin: 2em 0 0 0}
+
+	#main {
+		float: center;
+		width: 90%;
+		font-size: 100%;
+		padding: 15px;
+		margin: 10px auto;
+		background-color: rgba(255,255,255,0.9);
+		border-radius: 3px;
+	}
+}
+
+/* ===== INTERNET EXPLORER ===== */
+@media \0screen\,screen\9{
+
+	body { margin: 10px 0 10px 0 }
+
+	/* ===== BODY CONTAINER ===== */
+	#body-container {
+		text-align: left;
+		max-width: 1000px;
+		width: 100%;
+		margin: 0 auto 0 auto;
+		padding: 5px;
+		background:none;
+		background-color:rgba(0,0,0,0.75);
+		-ms-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#BF000000,endColorstr=#BF000000);
+		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#BF000000,endColorstr=#BF000000);
+		zoom:1;
+		border-radius: 3px;
+	}
+
+	/* ===== MAIN ===== */
+	#main h4 { margin: 2em 0 0 0}
+
+	#main {
+		float:left;
+		position: relative;
+		width: 65%;
+		font-size: 100%;
+		padding: 25px;
+		margin: 20px;
+		background:none;
+		background-color:rgba(255,255,255,0.9);
+		-ms-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#E6FFFFFF,endColorstr=#E6FFFFFF);
+		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#E6FFFFFF,endColorstr=#E6FFFFFF);
+		zoom:1;
+		border-radius: 3px;
+	}
+
+	#head {
+		background:none;
+		background-color:rgba(184,60,46,0.7);
+		-ms-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#B3b83c2e,endColorstr=#B3b83c2e);
+		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#B3b83c2e,endColorstr=#B3b83c2e);
+		zoom:1;
+	}
+
+}
+
+#main p { line-height: 1.4em; margin-top: 1em; }
+
+#main img { margin: .5em }
+
+/* === List === */
+#main ul {
+	list-style-type: disc;
+	padding: 0 0 0 1.6em
+}
+
+#main ol {
+	list-style-position: inside;
+	padding: 0 1.6em 0 1.6em
+}
+
+	#commentform fieldset p { margin: 0 0 .5em 0 }
+	
+	#comments li {
+		margin: 0 0 1.5em 0;
+		padding: 5px;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		background: #efefef
+	}
+	
+	/* === Class of main block === */
+	h2.date {
+		font-size: 0.8em;
+		color: #444;
+	}
+	
+	.date { /* date under titles of the entry */
+		font-size: 80%;
+		font-style: oblique;
+		color: black;
+		margin: .2em 0 .8em 0
+	}
+	
+	/* .entry class */
+	.entry {
+		margin: 0 0 1.5em 0;
+		padding: 0 0 1.5em 0;
+		overflow: auto; /* floating images fix IE<7*/
+		border-bottom: solid 1px #999;
+	}
+	
+	#main>.entry {
+		overflow: hidden; /* rest of the world :) */
+	}
+	/* end of .entry */
+	
+	#main ul.entry-footer { /*  entry footer */
+		clear: both;
+		font-size: 80%;
+		color: black;
+		margin: 2em 0 .5em 0;
+		text-align: right;
+	}
+	
+	.entry-footer li { 
+		display: block;
+	}
+	
+	
+	.admincontrols { /* [edit] and [delete] */
+		font-size: 80%;
+		text-align: right;
+	}
+	
+	.buttonbar { text-align: center }
+	
+	.buttonbar input {
+		text-align: center;
+		margin: .1em .5em;
+		padding: 0 1em
+	}
+	
+	.navigation { /* next entries & previous entries link */
+		font-size: 90%;
+		margin-bottom: 3em
+	}
+
+
+/* ===== FOOTER ===== */
+#footer {
+	clear: both;
+	text-align: center;
+	font-size: 90%;
+	color: white;
+	padding: 5px;
+}
+
+* {
+   font-family: 'Open Sans', sans-serif;
+   text-shadow: 1px 2px 3px rgba(0, 0, 0, 0.2);
+  }

fp-interface/themes/leggero/leggero-v2/res/globals.css

@@ -0,0 +1,55 @@
+/*
+===================
+Leggero CSS Styles
+===================
+
+Name: Leggero v2
+Author: NoWhereMan, drudo & Marc Thibeault
+Version: 0.1
+Module: globals.css
+*/
+
+.alignleft { float: left }
+
+.alignright { float: right }
+
+/* ===== NOTIFICATION ===== */
+#main ul.msgs, ul.msgs {
+	margin: 0;
+	padding: 1em 2em
+}
+
+.errors {
+	color: #901d1d;
+	border-top: 1px solid;
+	border-bottom: 1px solid;
+	border-color: #ffbbbb;
+	background: #ffdddd
+}
+
+.errors a {
+	color: #901d1d;
+	text-decoration: underline;
+	font-weight: normal
+}
+
+.notifications,.enabled {
+	color : #1d901d;
+	border-top: 1px solid #bbffbb;
+	border-bottom: 1px solid #bbffbb;
+	background: #ddffdd
+}
+
+.warnings {
+	color : #8a7802;
+	border-top: 1px solid;
+    border-bottom: 1px solid;
+	border-color: #f8e674;
+	background: #fffdd5;
+
+}
+
+.field-error {
+	border: red 1px solid;
+	background: #fdd
+}

fp-interface/themes/leggero/leggero-v2/res/print.css

@@ -0,0 +1,100 @@
+/*
+===================
+Leggero CSS Styles
+===================
+
+Name: Leggero v2
+Author: Laborix
+Version: 0.1
+Module: print.css
+*/
+
+body {
+  color: #333;
+  background-color: transparent;
+}
+
+a {
+  color: #333;
+  background-color: transparent;
+  text-decoration: none;
+}
+
+h1 {
+  font-size: 130%; 
+}
+
+h2 {
+  font-size: 130%; 
+}
+
+h3 {
+  font-size: 100%; 
+}
+
+h4 {
+  font-size: 100%; 
+}
+
+.date {
+  font-size: 100%;
+}
+
+#column {
+  display: none;
+}
+
+.admincontrols {
+  display: none;
+}
+
+.readmore {
+  display: none;
+}
+
+.navigation {
+  display: none;
+}
+
+.entry-footer {
+  clear: both;
+  font-size: 80%;
+  margin: 2em 0 3em 0;
+}
+
+blockquote {
+	margin: 1em 1em;
+	padding: 0 10px;
+	width: 90%;
+	color: #333;
+	background-color: transparent;
+	font-style: italic;
+	border-left: 5px solid #bbb;
+}
+
+pre {
+  clear: both;
+  margin: 0.5em 0 0.5em 0;
+  padding: 0.5em;
+  width: 90%;
+  color: #333;
+  background-color: #eee;
+  font-size: 70%;
+  border: 1px dotted #333;
+}
+
+.link-comments {
+  display: none;
+}
+
+hr {
+  display: none;
+}
+
+#footer {
+  display: none;
+}
+
+#commentform {
+  display: none;
+}

fp-interface/themes/leggero/leggero-v2/res/style.css

@@ -0,0 +1,27 @@
+/*
+===================
+Leggero CSS Styles
+===================
+
+Name: Leggero v2
+Author: NoWhereMan, drudo & Marc Thibeault
+Version: 0.1
+Module: style.css
+*/
+
+/* imports common style ruleset */
+@import url(common.css);
+@import url(globals.css);
+
+/* imports column (where widgets usually go) rules */
+@import url(column.css);
+
+#comments li.comment-admin {
+	padding:1em
+}
+
+#comments li.comment-admin strong.comment-name { font-size:140% }
+
+#widget-searchbox form {
+	text-align: center;
+}

fp-interface/themes/leggero/leggero-v2/style.conf.php

@@ -0,0 +1,22 @@
+<?php
+/*  
+Style Name: Leggero V2
+Style URI: http://www.flatpress.org/
+Description: A modern version of the default FlatPress theme.
+Version: 0.705
+Author: NoWhereMan, Drudo and Marc Thibeault
+Author URI: http://www.flatpress.org/
+*/
+	
+	$style['name'] = 'leggero-v2';
+	$style['author'] = 'NoWhereMan';
+	$style['www'] = 'http://www.flatpress.org/';
+	
+	$style['version'] = 0.705;
+		
+	$style['style_def'] = 'style.css';
+	$style['style_admin'] = 'admin.css';
+	$style['style_print'] = 'print.css';
+	$style['style'] = 'default';
+	
+?>

setup/lang/lang.en-us.php

@@ -158,6 +158,7 @@ Want to see more?
 
 [list]
 [*]Support the project with a [url=http://www.flatpress.org/home/static.php?page=donate]small donation[/url]
+[*]Contribute to the development of Flatpress on [url="https://github.com/evacchi/flatpress"]GitHub[/url]!
 [*]Translate FlatPress or the documentation into [url=http://wiki.flatpress.org/res:language]your language[/url]
 [*]Share your knowledge with other people on the [url=http://www.flatpress.org/forums/categories.php]forums[/url]
 [*]Spread the word!