summaryrefslogtreecommitdiffstats
path: root/common/custom
diff options
context:
space:
mode:
authorNicolas Lécureuil <neoclust@mageia.org>2020-05-17 14:46:00 +0200
committerNicolas Lécureuil <neoclust@mageia.org>2020-05-17 14:46:00 +0200
commite3de9d7dd1331f9718e04cc98e9ca7cfa27cf4aa (patch)
tree336981502f93ceb9fa5ed33ea3b47dcefc5a8402 /common/custom
parentff32e499745367b816d10f25e63ff3328214c32f (diff)
downloadplanet-e3de9d7dd1331f9718e04cc98e9ca7cfa27cf4aa.tar
planet-e3de9d7dd1331f9718e04cc98e9ca7cfa27cf4aa.tar.gz
planet-e3de9d7dd1331f9718e04cc98e9ca7cfa27cf4aa.tar.bz2
planet-e3de9d7dd1331f9718e04cc98e9ca7cfa27cf4aa.tar.xz
planet-e3de9d7dd1331f9718e04cc98e9ca7cfa27cf4aa.zip
Sync with master of moonmoon ( version 9.0.0-rc)HEADuser/wally/upstream-10-devmaster
Source from https://github.com/Emmafrs/moonmoon/
Diffstat (limited to 'common/custom')
-rw-r--r--common/custom/img/moonmoon.pngbin0 -> 73408 bytes
-rw-r--r--common/custom/img/moonmoon@128w.pngbin0 -> 8671 bytes
-rw-r--r--common/custom/img/moonmoon@256w.pngbin0 -> 24255 bytes
-rw-r--r--common/custom/style/default.css136
-rwxr-xr-xcommon/custom/views/archive/footer.tpl.php2
-rwxr-xr-xcommon/custom/views/archive/index.tpl.php8
-rwxr-xr-xcommon/custom/views/archive/sidebar.tpl.php2
-rwxr-xr-xcommon/custom/views/default/footer.tpl.php2
-rwxr-xr-xcommon/custom/views/default/index.tpl.php12
-rwxr-xr-xcommon/custom/views/default/sidebar.tpl.php2
-rw-r--r--common/custom/views/default/top.tpl.php2
-rw-r--r--common/custom/views/install.tpl.php119
12 files changed, 217 insertions, 68 deletions
diff --git a/common/custom/img/moonmoon.png b/common/custom/img/moonmoon.png
new file mode 100644
index 0000000..10f9736
--- /dev/null
+++ b/common/custom/img/moonmoon.png
Binary files differ
diff --git a/common/custom/img/moonmoon@128w.png b/common/custom/img/moonmoon@128w.png
new file mode 100644
index 0000000..2a164aa
--- /dev/null
+++ b/common/custom/img/moonmoon@128w.png
Binary files differ
diff --git a/common/custom/img/moonmoon@256w.png b/common/custom/img/moonmoon@256w.png
new file mode 100644
index 0000000..b52c4bb
--- /dev/null
+++ b/common/custom/img/moonmoon@256w.png
Binary files differ
diff --git a/common/custom/style/default.css b/common/custom/style/default.css
index de813ac..12268ef 100644
--- a/common/custom/style/default.css
+++ b/common/custom/style/default.css
@@ -1,128 +1,158 @@
-html{
+@viewport {
+ width: device-width;
+ initial-scale: 1.0;
+}
+
+html {
font-family: "Lucida Grande", "Segoe UI", sans-serif;
color: #111;
background: #EEE;
font-size: 62.5%;
}
-body{
+body {
margin: 0;
padding: 0;
font-size: 1.3em;
line-height: 1.5em;
}
-a{
+a {
color: #669;
}
-a:visited{
+a:visited {
color: #444;
}
-a:hover{
+a:hover {
color: #000;
}
-a img{
+a img {
border: none;
}
-pre, code{
+pre, code {
max-height: 100%;
width: 100%;
font-size: 1.2em;
overflow: auto;
}
-h1, h2{
+h1, h2 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
-h2{
+h2 {
margin: 0;
}
#page {
- width: 890px;
- margin: 0 auto;
+ margin: 0 5em;
}
/* Header
*******************************************************************************/
+
#top {
color: #FFF;
padding: 10px 30px;
}
- h1 a,
- h1 a:visited {
- color: #665;
- text-decoration: none;
- }
- h1 a:hover {
- color: #444;
- }
+
+h1 a, h1 a:visited {
+ color: #665;
+ text-decoration: none;
+}
+
+h1 a:hover {
+ color: #444;
+}
/* Content
*******************************************************************************/
+
#content {
- width: 590px;
+ width: 75%;
float: left;
}
+#content img {
+ max-width: 100%;
+ height: auto;
+}
+
/* Sidebar
*******************************************************************************/
+
#sidebar {
- width: 300px;
+ width: 18%;
float: left;
}
- #sidebar div {
- padding: 1em 30px;
- }
- #sidebar h2 {
- color: #665;
- }
- #sidebar ul {
- list-style: none;
- padding: 0;
- margin: 1em 0;
- }
-
+
+#sidebar div {
+ padding: 1em 30px;
+}
+
+#sidebar h2 {
+ color: #665;
+}
+
+#sidebar ul {
+ list-style: none;
+ padding: 0;
+ margin: 1em 0;
+}
+
/* Article
*******************************************************************************/
-.article{
+
+.article {
margin-bottom: 2em;
padding: 30px;
background: #FFF;
border: 1px solid #DDD;
+ overflow: hidden;
}
- .article-title,
- .article-title a{
- color: #111;
- text-decoration: none;
- }
+.article-title, .article-title a {
+ color: #111;
+ text-decoration: none;
+}
- .article-info{
- margin: 0 0 1em 0;
- color: #999;
- }
-
- .article-content {
- font-family: Georgia, serif;
- }
+.article-info {
+ margin: 0 0 1em 0;
+ color: #999;
+}
- .article img{
- max-width: 440px;
- }
+.article-content {
+ font-family: Georgia, serif;
+}
- .article .collapsed{
- display: none;
- }
+.article img {
+ max-width: 440px;
+}
+
+.article .collapsed {
+ display: none;
+}
/* Footer
*******************************************************************************/
+
#footer {
clear: both;
padding: 0 30px;
+}
+
+@media screen and (max-width: 1023px) {
+ #page {
+ margin: 0px;
+ display: flex;
+ flex-direction: column;
+ }
+ #content, #sidebar {
+ float: none;
+ width: 100%;
+ }
} \ No newline at end of file
diff --git a/common/custom/views/archive/footer.tpl.php b/common/custom/views/archive/footer.tpl.php
index bfc0210..c9c84b1 100755
--- a/common/custom/views/archive/footer.tpl.php
+++ b/common/custom/views/archive/footer.tpl.php
@@ -1,3 +1,3 @@
<div id="footer">
- <p><? echo str_replace('%s', 'href="http://moonmoon.org"', _g('Powered by <a %s>moonmoon</a>'))?> | <a href="./admin/"><?=_g('Administration')?></a></p>
+ <p><?php echo str_replace('%s', 'href="http://moonmoon.org"', _g('Powered by <a %s>moonmoon</a>'))?> | <a href="./admin/"><?=_g('Administration')?></a></p>
</div>
diff --git a/common/custom/views/archive/index.tpl.php b/common/custom/views/archive/index.tpl.php
index 2bb8f36..16bc6ab 100755
--- a/common/custom/views/archive/index.tpl.php
+++ b/common/custom/views/archive/index.tpl.php
@@ -29,12 +29,12 @@ header('Content-type: text/html; charset=UTF-8');
<meta http-equiv="Content-Style-Type" content="text/css" />
<title><?php echo $PlanetConfig->getName(); ?></title>
- <?php include(dirname(__FILE__).'/head.tpl.php'); ?>
+ <?php include(__DIR__.'/head.tpl.php'); ?>
</head>
<body>
<div id="page">
- <?php include(dirname(__FILE__).'/top.tpl.php'); ?>
+ <?php include(__DIR__.'/top.tpl.php'); ?>
<div id="content">
<?php if (0 == count($items)) :?>
@@ -106,9 +106,9 @@ header('Content-type: text/html; charset=UTF-8');
<?php endif; ?>
</div>
- <?php include_once(dirname(__FILE__).'/sidebar.tpl.php'); ?>
+ <?php include_once(__DIR__.'/sidebar.tpl.php'); ?>
- <?php include(dirname(__FILE__).'/footer.tpl.php'); ?>
+ <?php include(__DIR__.'/footer.tpl.php'); ?>
</div>
</body>
</html>
diff --git a/common/custom/views/archive/sidebar.tpl.php b/common/custom/views/archive/sidebar.tpl.php
index e21f377..7a5d080 100755
--- a/common/custom/views/archive/sidebar.tpl.php
+++ b/common/custom/views/archive/sidebar.tpl.php
@@ -1,5 +1,5 @@
<?php
-$all_people = &$Planet->getPeople();
+$all_people = $Planet->getPeople();
usort($all_people, array('PlanetFeed', 'compare'));
?>
<div id="sidebar">
diff --git a/common/custom/views/default/footer.tpl.php b/common/custom/views/default/footer.tpl.php
index bfc0210..c9c84b1 100755
--- a/common/custom/views/default/footer.tpl.php
+++ b/common/custom/views/default/footer.tpl.php
@@ -1,3 +1,3 @@
<div id="footer">
- <p><? echo str_replace('%s', 'href="http://moonmoon.org"', _g('Powered by <a %s>moonmoon</a>'))?> | <a href="./admin/"><?=_g('Administration')?></a></p>
+ <p><?php echo str_replace('%s', 'href="http://moonmoon.org"', _g('Powered by <a %s>moonmoon</a>'))?> | <a href="./admin/"><?=_g('Administration')?></a></p>
</div>
diff --git a/common/custom/views/default/index.tpl.php b/common/custom/views/default/index.tpl.php
index 1bf037a..c33ffa5 100755
--- a/common/custom/views/default/index.tpl.php
+++ b/common/custom/views/default/index.tpl.php
@@ -10,9 +10,10 @@ header('Content-type: text/html; charset=UTF-8');
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><?php echo $PlanetConfig->getName(); ?></title>
- <?php include(dirname(__FILE__).'/head.tpl.php'); ?>
+ <?php include(__DIR__.'/head.tpl.php'); ?>
</head>
<body>
@@ -20,7 +21,7 @@ header('Content-type: text/html; charset=UTF-8');
document.body.className += 'js';
</script>
<div id="page">
- <?php include(dirname(__FILE__).'/top.tpl.php'); ?>
+ <?php include(__DIR__.'/top.tpl.php'); ?>
<div id="content">
<?php if (0 == count($items)) : ?>
@@ -41,8 +42,7 @@ header('Content-type: text/html; charset=UTF-8');
<a href="<?php echo $item->get_permalink(); ?>" title="Go to original place"><?php echo $item->get_title(); ?></a>
</h2>
<p class="article-info">
-
- <?php echo ($item->get_author()? $item->get_author()->get_name() : 'Anonymous'); ?>,
+ <?php echo strip_tags(($item->get_author()? $item->get_author()->get_name() : 'Anonymous')); ?>,
<?php
$ago = time() - $item->get_date('U');
//echo '<span title="'.Duration::toString($ago).' ago" class="date">'.date('d/m/Y', $item->get_date('U')).'</span>';
@@ -65,9 +65,9 @@ header('Content-type: text/html; charset=UTF-8');
<?php endif; ?>
</div>
- <?php include_once(dirname(__FILE__).'/sidebar.tpl.php'); ?>
+ <?php include_once(__DIR__.'/sidebar.tpl.php'); ?>
- <?php include(dirname(__FILE__).'/footer.tpl.php'); ?>
+ <?php include(__DIR__.'/footer.tpl.php'); ?>
</div>
</body>
</html>
diff --git a/common/custom/views/default/sidebar.tpl.php b/common/custom/views/default/sidebar.tpl.php
index 830f3c6..13ae626 100755
--- a/common/custom/views/default/sidebar.tpl.php
+++ b/common/custom/views/default/sidebar.tpl.php
@@ -1,5 +1,5 @@
<?php
-$all_people = &$Planet->getPeople();
+$all_people = $Planet->getPeople();
usort($all_people, array('PlanetFeed', 'compare'));
?>
<div id="sidebar" class="aside">
diff --git a/common/custom/views/default/top.tpl.php b/common/custom/views/default/top.tpl.php
index dd6206f..6db425c 100644
--- a/common/custom/views/default/top.tpl.php
+++ b/common/custom/views/default/top.tpl.php
@@ -1,3 +1,3 @@
<div id="header">
- <h1 id="top"><a href="<?php echo $PlanetConfig->getUrl() ?>"><?php echo $PlanetConfig->getName(); ?></a></h1>
+ <h1 id="top"><a href="<?php echo $PlanetConfig->getUrl(); ?>"><?php echo $PlanetConfig->getName(); ?></a></h1>
</div> \ No newline at end of file
diff --git a/common/custom/views/install.tpl.php b/common/custom/views/install.tpl.php
new file mode 100644
index 0000000..9eaff65
--- /dev/null
+++ b/common/custom/views/install.tpl.php
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8"/>
+<head>
+ <title><?=_g('moonmoon installation')?></title>
+ <style>
+ body {
+ font: normal 1em sans-serif;
+ width: 500px;
+ margin: 0 auto;
+ }
+
+ /* Error */
+ td.ok {
+ color: #090;
+ }
+
+ td.fail {
+ color: #900;
+ font-weight: bold;
+ }
+ th {
+ text-align: left;
+ }
+
+ /* Install */
+ .field label {
+ display: block;
+ }
+
+ .submit {
+ font-size: 2em;
+ }
+
+ </style>
+</head>
+
+<body>
+<h1><?=_g('moonmoon installation')?></h1>
+
+<?php if ($status == 'error') : ?>
+ <div id="compatibility">
+ <h2>Sorry, your server is not compatible with moonmoon.</h2>
+
+ <h3>Your server does not fulfill the requirements</h3>
+ <table>
+ <thead>
+ <tr>
+ <th>Test</th>
+ <th>Result</th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php echo $strInstall ?>
+ </tbody>
+ </table>
+
+ <h3>Troubleshooting</h3>
+ <p>To install moonmoon, try the following changes:</p>
+ <ul>
+ <?php echo $strRecommendation; ?>
+ </ul>
+ </div>
+
+<?php elseif ($status == 'install') : ?>
+ <div>
+ <form method="post" action="">
+ <fieldset>
+ <input type="hidden" id="url" name="url" value="" readonly="readonly"/>
+ <script>
+ <!--
+ document.forms[0].elements[1].value = document.URL.replace('install.php','');
+ -->
+ </script>
+
+ <p class="field">
+ <label for="title">Title:</label>
+ <input type="text" id="title" name="title" value="My website"/>
+ </p>
+ <!--
+ <p class="field">
+ <label>Administrator login:</label> <code>admin</code>
+ </p>
+ -->
+ <p class="field">
+ <label for="password">Administrator password:</label>
+ <input type="text" id="password" name="password" class="text password" value="admin" />
+ </p>
+ <p class="field">
+ <label for="locale">Language:</label>
+ <select name="locale" id="locale">
+ <option selected="selected" value="en">English</option>
+ <option value="es">Español</option>
+ <option value="fr">Français</option>
+ <option value="en">Deutsch</option>
+ </select>
+ </p>
+ <p>
+ <input type="submit" class="submit" value="Install"/>
+ </p>
+ </fieldset>
+ </form>
+ </div>
+
+<?php elseif ($status =='installed'): ?>
+
+ <p><?=_g('Congratulations! Your moonmoon is ready.')?></p>
+ <h3><?=_g("What's next?")?></h3>
+ <ol>
+ <li>
+ <?=_g('<strong>Delete</strong> <code>install.php</code> with your FTP software.')?>
+ </li>
+ <li>
+ <?=_g('Use your password to go to the <a href="./admin/">administration panel</a>')?>
+ </li>
+ </ol>
+<?php endif; ?>
+</body>
+</html>