diff --git a/.gitignore b/.gitignore index 80f408e..87a85d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nbproject/ +.idea/ diff --git a/articles/example/2015-07-24-example.md b/articles/example/2015-07-24-example.md index c9865d0..baa9016 100644 --- a/articles/example/2015-07-24-example.md +++ b/articles/example/2015-07-24-example.md @@ -5,3 +5,5 @@ This is the official Rangitaki logo. ![The Rangitaki logo](media/example.png) + +It is saved in the example blog directory. diff --git a/index.php b/index.php index 094e3b6..601c8d8 100644 --- a/index.php +++ b/index.php @@ -33,18 +33,48 @@ $getblog = filter_input(INPUT_GET, "blog"); // getting the blog variable $getarticle = filter_input(INPUT_GET, "article"); // getting the article variable $gettag = filter_input(INPUT_GET, "tag"); // getting the tag variable $url = "http://" . filter_input(INPUT_SERVER, "HTTP_HOST") . filter_input(INPUT_SERVER, "REQUEST_URI"); // getting the url (used for sharing) + +// Fetching necessary information about the current article +// Set blog to "main" if on main blog, else to $getblog. This variable is needed later +if ($getblog == "") { + $blog = "main"; +} else { + $blog = $getblog; +} +$articlesdir = "./articles/$blog/"; // generate a variable with the articles directory +// Fetching the articles title +if (isset($getarticle)) { + $articletitle = ArticleGenerator::getTitle($articlesdir, $getarticle . '.md'); +} +// Make sure that the entry has a title, because main.md hasn't one +if (empty($blogmainname)) { + $blogmaintitle = $blogtitle; +} else { + $blogmaintitle = $blogmainname; +} +if (isset($getblog)) { + $subblogtitle = BlogListGenerator::getName('./blogs/' . $getblog . '.md'); +} else { + $subblogtitle = $blogmaintitle; +} +// Generate title for the html head +if (isset($getarticle)) { + $hd_subblog_title = $articletitle . ' - ' . $subblogtitle; +} else { + $hd_subblog_title = $subblogtitle; +} ?> - <?php echo $blogtitle; // Setting the blog article?> + <?php echo $hd_subblog_title; ?> - + @@ -53,7 +83,7 @@ $url = "http://" . filter_input(INPUT_SERVER, "HTTP_HOST") . filter_input(INPUT_ - + @@ -86,27 +116,24 @@ if ($nav_drawer == "yes") { ?>
+
+ Close +
3) { // Checking if not in article or tag view and if there are more the one blog. The 3 is for these three array entries: 'main.md', '.', '..' echo "
"; echo "
" . $BLOGLANG['Blogs on'] . " $blogtitle:
"; // 1. Set localized string 2. Set blogtitle - foreach ($blogs as $blog) { // iterating through the blogs/ directory - if (strlen($blog) >= 3 && substr($blog, -3) == ".md") { // check if filename is larger than three chars and if the file ends with ".md" + foreach ($blogs as $navblog) { // iterating through the blogs/ directory + if (strlen($navblog) >= 3 && substr($navblog, -3) == ".md") { // check if filename is larger than three chars and if the file ends with ".md" if ($getblog == "") { // Run when on main blog - if ($blog != "main.md") { // excluding main blog - BlogListGenerator::listBlog("./blogs/", $blog, $blogtitle); // creating navigation item + if ($navblog != "main.md") { // excluding main blog + BlogListGenerator::listBlog("./blogs/", $navblog, $blogtitle); // creating navigation item } } else { - if ($getblog . ".md" != $blog) { // Check if $blog is current blog -> this blog will be excluded - // Make sure that the entry has a title, because main.md hasn't one - if (empty($blogmainname)) { - $blogmaintitle = $blogtitle; - } else { - $blogmaintitle = $blogmainname; - } - BlogListGenerator::listBlog("./blogs/", $blog, $blogmaintitle); // creating navigation item + if ($getblog . ".md" != $navblog) { // Check if $blog is current blog -> this blog will be excluded + BlogListGenerator::listBlog("./blogs/", $navblog, $blogmaintitle); // creating navigation item } } } @@ -128,12 +155,6 @@ if ($nav_drawer == "yes") {
@@ -181,7 +202,6 @@ if ($getblog == "") { tag view $articles = scandir($articlesdir, 1); // save the content of the directory in the articles variable @@ -216,8 +236,7 @@ if ($getblog == "") { ?>
- : ' + : ' target="blank"> diff --git a/rcc/index.php b/rcc/index.php index 1e50b67..c52a198 100644 --- a/rcc/index.php +++ b/rcc/index.php @@ -110,6 +110,16 @@ THE SOFTWARE.
+
+
Media Upload
+
+ + +
+
+ +
+
diff --git a/rcc/media/index.php b/rcc/media/index.php new file mode 100644 index 0000000..1e66ea8 --- /dev/null +++ b/rcc/media/index.php @@ -0,0 +1,60 @@ + + + + + + Rangitaki Control Center + + + + +
+ Rangitaki Control Center +
+
+
+
File Upload
+ You have to choose a file!

"; + } else { + $uploaddir = "../../media/"; + $uploadfile = $uploaddir . basename($_FILES['userfile']['name']); + + if (move_uploaded_file($_FILES['userfile']['tmp_name'], $uploadfile)) { + echo "

The post was successfully uploaded and is now published.

"; + } else { + echo "

During the uploading process an error occured!
Error Code:" . ($_FILES['userfile']['error'] . "

"); + } + } + ?>GO BACK +
+
+ + diff --git a/rcc/newpost/index.php b/rcc/newpost/index.php index 1e7b0c4..77418da 100644 --- a/rcc/newpost/index.php +++ b/rcc/newpost/index.php @@ -61,6 +61,7 @@ EOD; } else { echo "Some error happend, while publishing."; } + ?>GO BACK diff --git a/rcc/res/rcc.js b/rcc/res/rcc.js index 3e33f42..6539a71 100644 --- a/rcc/res/rcc.js +++ b/rcc/res/rcc.js @@ -2,6 +2,9 @@ window.onload = function () { var t = document.getElementsByTagName('textarea')[0]; var offset = !window.opera ? (t.offsetHeight - t.clientHeight) : (t.offsetHeight + parseInt(window.getComputedStyle(t, null).getPropertyValue('border-top-width'))); + /** + * The following three code clocks are for proper resizing of the input textarea + */ var resize = function (t) { t.style.height = 'auto'; t.style.height = (t.scrollHeight + offset ) + 'px'; diff --git a/rcc/uploaded/index.php b/rcc/uploaded/index.php index d5400d1..462c7a2 100644 --- a/rcc/uploaded/index.php +++ b/rcc/uploaded/index.php @@ -52,6 +52,7 @@ THE SOFTWARE. echo "

During the uploading process an error occured!
Error Code:" . ($_FILES['userfile']['error'] . "

"); } } + ?>GO BACK diff --git a/res/css/rangitaki.css b/res/css/rangitaki.css index 459acfe..00f64a2 100644 --- a/res/css/rangitaki.css +++ b/res/css/rangitaki.css @@ -97,7 +97,6 @@ body{ height: 100%; top: 0; left: -301px; - padding-top: 64px; z-index: 40; } @@ -113,6 +112,15 @@ body{ transition: background-color 125ms ease-in-out 0ms; } +.nav-close { + cursor: pointer; +} + +.nav-close-img{ /* the hamburger icon */ + height: 35px; + padding: 12px; +} + .nav-item{ /* additional setting for clickable nav items */ cursor: pointer; } @@ -229,6 +237,15 @@ body{ .nav{ /* always show navigation bar */ left: 0; + padding-top: 64px; + } + + .nav-close-img { + display: none; + } + + .nav-close { + display: none; } .nav-img{ /* always hide navigation bar icon*/ diff --git a/res/img/close-dark.svg b/res/img/close-dark.svg new file mode 100644 index 0000000..2d1201f --- /dev/null +++ b/res/img/close-dark.svg @@ -0,0 +1,60 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/res/js/app.js b/res/js/app.js index 56dae56..88b9e0e 100644 --- a/res/js/app.js +++ b/res/js/app.js @@ -40,7 +40,7 @@ var main = function () { // main function; called below ); var navOpen = false; // nav hidden at begin - $('.nav-img, .overlay').click( // action on hamburger click + $('.nav-img, .overlay, .nav-close').click( // action on hamburger click function () { if (!(navOpen)) { // if nav is hidden openNav(); // open the nav drawer diff --git a/res/php/ArticleGenerator.php b/res/php/ArticleGenerator.php index d5f8847..ee109c3 100644 --- a/res/php/ArticleGenerator.php +++ b/res/php/ArticleGenerator.php @@ -133,4 +133,20 @@ class ArticleGenerator return $tags; // remove that array } + /** + * A function to get an article title as a string + * + * @param string $directory The directory where the article files are stored + * @param string $articlefile The name of the article file + * @return string + */ + function getTitle($directory, $articlefile) + { + $article = file_get_contents($directory . $articlefile); // get the article + if (substr($article, 0, 6) == "%TITLE") { // detect and remove the title + $title = substr($article, 8, strpos($article, "\n") - 8); // get this title + return $title; // remove that array + } + } + }