Added a page footer feature

ipari · Mar 11, 2017 · 0a8376d · 0a8376d
1 parent de16ff2
commit 0a8376d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/conf/default.php b/conf/default.php
@@ -8,3 +8,4 @@
 
 $conf['numberedHeading']           = 0;
 $conf['tocPosition']               = 'wikipedia';
+$conf['footer']                    = '';
diff --git a/conf/metadata.php b/conf/metadata.php
@@ -8,3 +8,4 @@
 
 $meta['numberedHeading']       = array('onoff');
 $meta['tocPosition']           = array('multichoice', '_choices' => array('dokuwiki', 'wikipedia'));
+$meta['footer']                = array('string');
diff --git a/css/design.less b/css/design.less
@@ -277,20 +277,32 @@
     padding: 0.5em 1em;
 
     div.doc {
-        margin-bottom: .6em;
+        margin-bottom: 1em;
     }
-    .license {
+    div.license {
+        margin-bottom: 1em;
+        font-size: 85%;
+
         > a {
-            display: block;
             float: left;
             margin-right: .5em;
-            height: 2em;
+            padding-top: .3em;
+        }
+        a.urlextern {
+            float: left;
+            display: block;
+            background-position: 0 0.2em;
+        }
+        :after {
+            content: '';
+            display: block;
+            clear: both;
         }
     }
+    div.footer {
+        margin: 0 -1em;
+        padding: 0.5em 1em;
+    }
 }
 
-.license a.urlextern {
-    display: block;
-    background-position: top left;
-}
 /* icons */
diff --git a/lang/en/settings.php b/lang/en/settings.php
@@ -3,4 +3,5 @@
 $lang['numberedHeading']         = 'Numbering headings';
 $lang['tocPosition']             = 'Position of TOC';
 $lang['tocPosition_o_dokuwiki']  = 'DokuWiki';
-$lang['tocPosition_o_wikipedia'] = 'Wikipedia';
+$lang['tocPosition_o_wikipedia'] = 'Wikipedia';
+$lang['footer']                  = 'Footer page name, empty field disables the footer';
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
@@ -4,3 +4,4 @@
 $lang['tocPosition']             = '목차의 위치';
 $lang['tocPosition_o_dokuwiki']  = '도쿠위키 기본';
 $lang['tocPosition_o_wikipedia'] = '위키백과 스타일';
+$lang['footer']                  = '바닥글 문서 이름, 필드를 비우면 바닥글 비활성화';
diff --git a/main.php b/main.php
@@ -133,7 +133,7 @@
                 <?php } ?>
 
                 <div class="page group
-                <?php if (tpl_getConf('numberedHeading')): ?> numbered_heading<?php endif ?>
+                <?php if(tpl_getConf('numberedHeading')): ?> numbered_heading<?php endif ?>
                 <?php if(tpl_getConf('tocPosition')): ?> toc_<?php echo tpl_getConf('tocPosition') ?><?php endif ?>
                 ">
                     <!-- wikipage start -->
@@ -147,8 +147,14 @@
 
             <!-- ********** FOOTER ********** -->
             <div id="dokuwiki__footer">
+                <?php if($INFO['exists']): ?>
                 <div class="doc"><?php white_pageinfo() ?></div>
+                <?php endif ?>
+                <?php tpl_includeFile('sidebarfooter.html') ?>
                 <?php tpl_license('badge', false, false) ?>
+                <div class="footer">
+                <?php tpl_include_page(tpl_getConf('footer'), 1, 1) ?>
+                </div>
             </div><!-- /footer -->
 
             <?php tpl_includeFile('footer.html') ?>