Merge branch 'master' into myAutoBlog

Conflicts:
	0.3/index.php
This commit is contained in:
Knah Tsaeb 2013-04-08 16:16:16 +02:00
commit d9b23add41
3 changed files with 29 additions and 30 deletions

View file

@ -53,5 +53,5 @@ $autoblog_farm = array(
// personnal option
$myOptions['enableThumbShot'] = false;
$myOptions['externalThumbSdhot'] = 'http://exemple.com/?url=';
$myOptions['externalThumbSdhot'] = '';
?>

View file

@ -839,7 +839,7 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY
</p>
<div class="clear"><a href="?sitemap">sitemap</a> | <a href="?export">export<sup> JSON</sup></a> | <a href="?exportopml">export<sup> OPML</sup></a></div>
<div id="contentVignette">
<?php
$subdirs = glob(AUTOBLOGS_FOLDER . "*");
$autoblogs = array();
@ -867,7 +867,6 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY
uasort($autoblogs, "objectCmp");
$autoblogs_display = '';
if(!empty($autoblogs)){
foreach ($autoblogs as $key => $autoblog) {
$opml_link='<a href="'.$key.'/?opml">opml</a>';
@ -884,10 +883,9 @@ if( !empty($_POST['opml_file']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY
</div>';
}
}
echo $autoblogs_display;
?>
</div>
<div class="clear"></div>
<?php echo "<p>".count($autoblogs)." autoblogs hébergés</p>"; ?>

View file

@ -18,7 +18,8 @@ input[type="submit"] {width:8em;}
input[type="text"]#socialaccount, input[type="text"]#statusneturl, input[type="text"]#shaarliurl,input[type="text"].smallinput {width:20em;}
div.form {padding:0.2em;border:1px solid #fff;}
div.form:hover {background-color:#FAF4DA;border:1px dotted;}
.vignette {width:20em;height:2em;float:left;margin:0; padding:20px;background-color:#eee;border: 1px solid #888;}
#contentVignette {text-align: center;}
.vignette {width:20em;height:2em;display: inline-block;text-align:justify;margin:0; padding:20px;background-color:#eee;border: 1px solid #888;}
.vignette:hover {background-color:#fff;}
.vignette .title {font-size: 14pt;text-shadow: #ccc 0px 5px 5px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.vignette .title a:hover {color:darkred; text-decoration:none;}