Merge pull request #28 from LeonStaufer/issue-fixes

Issue fixes
LeonStaufer · Jan 29, 2019 · 68b8aa6 · 68b8aa6
2 parents 07e6887 + 50aadaa
commit 68b8aa6
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 29 deletions.
diff --git a/css/basic.less b/css/basic.less
@@ -141,13 +141,6 @@ body {
   }
 }
 
-.mdl-logo {
-  a {
-    color: @light_primary;
-    text-decoration: none;
-  }
-}
-
 .content-search__popup {
   background: #fff;
   width: 100%;
@@ -166,10 +159,15 @@ body {
   box-shadow: inset 0px -1px 4px 0px rgba(0,0,0,0.7);
   ._shadow_1dp;
   .mdl-logo{
-    margin-bottom: 15px;
-    img{
+    padding: 16px;
+    margin: 0;
+    img {
       width: 100%;
     }
+    a {
+      color: @light_primary;
+      text-decoration: none;
+    }
   }
 }
 

diff --git a/css/fixes.less b/css/fixes.less
@@ -17,6 +17,11 @@ a {
   margin-left: 0;
 }
 
+//media manager styling fix
+.panel, .panelContent {
+  height: auto !important;
+}
+
 //other fixes
 .plugin_translation{
   a{

diff --git a/main.php b/main.php
@@ -56,6 +56,13 @@
             <?php
             foreach ((new \dokuwiki\Menu\UserMenu())->getItems() as $action){
                 switch ($action->getType()){
+                    case "register":{
+                        tpl_action('register', true, false, false, '', '', "
+                            <button class=\"mdl-button mdl-js-button mdl-button--icon mdl-js-ripple-effect mdl-button--colored\">
+                              <i class=\"material-icons\">person_add</i>
+                            </button>");
+                        break;
+                    }
                     case "login":{
                         tpl_action('login', true, false, false, '', '', "
                             <button class=\"mdl-button mdl-js-button mdl-button--icon mdl-js-ripple-effect mdl-button--colored\">
@@ -203,7 +210,7 @@
                 <div class="content-card__text">
                     <?php
                     /*  Do you see the heading twice because you have 'useheading' enabled?
-                        You can use one of these two plugins to elegantly hide the redudant second title
+                        You can use one of these two plugins to elegantly hide the redundant second title
                             -https://www.dokuwiki.org/plugin:pagetitle
                             -https://www.dokuwiki.org/plugin:hiddenheader
                     */

diff --git a/sidebar.php b/sidebar.php
@@ -38,22 +38,30 @@
     "HTTP_ACCEPT_LANGUAGE: " .  $_SERVER["HTTP_ACCEPT_LANGUAGE"] . "\n".
     "HTTP_X_REAL_IP: " .  $_SERVER["HTTP_X_REAL_IP"];
 if($technical) $feedbackLink .= rawurlencode("\n\n====PLEASE DO NOT DELETE=====\nPage:".$INFO['id']."\nPerm:".$INFO['perm']."\nUser:".$INFO['client']."\nMobile:".$INFO['ismobile']."\nAction:".$ACT."\n====MORE TECH INFORMATION=====\n".$technicalDump);
-?>
 
-<?php
-if($sidebarPage) tpl_include_page("sidebar");
-?>
-
-<a class="mdl-navigation__link" href="<?php echo DOKU_BASE . "doku.php?id=wiki:dokuwiki" ?>">
-    <i class="material-icons" role="presentation">done_all</i>
-    First link</a>
-<a class="mdl-navigation__link" href="<?php echo DOKU_BASE . "doku.php?id=playground:playground" ?>">
-    <i class="material-icons" role="presentation">done</i>
-    Second link</a>
-<div class="mdl-layout-spacer"></div>
-<a class="mdl-navigation__link" href="<?php echo DOKU_BASE . "about" ?>">
-    <i class="material-icons" role="presentation">info_outline</i>
-    About</a>
-<a class="mdl-navigation__link" href="<?php echo DOKU_BASE . "help/" ?>">
-    <i class="material-icons" role="presentation">help_outline</i>
-    Help</a>
+if($sidebarPage) {
+    tpl_include_page("sidebar");
+}else {
+    /*
+     *
+     * You can edit the HTML below to style your own sidebar
+     *
+     */
+    echo '
+        <a class="mdl-navigation__link" href="'. DOKU_BASE . 'doku.php?id=wiki:dokuwiki">
+            <i class="material-icons" role="presentation">done_all</i>
+            First link</a>
+        <a class="mdl-navigation__link" href="'. DOKU_BASE . 'doku.php?id=playground:playground">
+            <i class="material-icons" role="presentation">done</i>
+            Second link</a>
+        <div class="mdl-layout-spacer"></div>
+        <a class="mdl-navigation__link" href="'. DOKU_BASE . 'about">
+            <i class="material-icons" role="presentation">info_outline</i>
+            About</a>
+        <a class="mdl-navigation__link" href="'. DOKU_BASE . 'help/">
+            <i class="material-icons" role="presentation">help_outline</i>
+            Help</a>
+    ';
+}
+
+//TODO: do not overwrite the user's sidebar with every update
diff --git a/template.info.txt b/template.info.txt
@@ -1,7 +1,7 @@
 base     material
 author   Leon Staufer
 email    [email protected]
-date     2018-08-04
+date     2019-01-29
 name     Material Template
 desc     A versatile material design style template.
 url      https://www.dokuwiki.org/template:material