From d0b97fa27feef295dde5d9a9c850932aa7b3769d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschl=C3=A4nder?= Date: Thu, 15 Dec 2016 11:40:18 +0100 Subject: [PATCH] new structure --- conf/default.php | 2 + conf/metadata.php | 2 + css/area_nav-usertools.less | 1 + images/logo.png | Bin 5704 -> 0 bytes lang/de/lang.php | 28 ++--- lang/en/lang.php | 29 +++--- main.php | 198 +++++++++++++++++++++++------------- tpl/main-sidebar-logo.php | 13 +++ tpl/main-sidebar-search.php | 5 + tpl/nav-direct.php | 6 +- tpl/nav-main.php | 7 ++ tpl/nav-sitetools.php | 15 +++ 12 files changed, 206 insertions(+), 100 deletions(-) delete mode 100644 images/logo.png create mode 100644 tpl/main-sidebar-logo.php create mode 100644 tpl/main-sidebar-search.php create mode 100644 tpl/nav-main.php create mode 100644 tpl/nav-sitetools.php diff --git a/conf/default.php b/conf/default.php index 417a7e1..102ef3b 100755 --- a/conf/default.php +++ b/conf/default.php @@ -4,6 +4,8 @@ * */ +$conf['logo'] = 'logo.png'; + $conf['discussionPage'] = 'discussion:@ID@'; $conf['userPage'] = 'user:@USER@:'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 9a62ec3..8ca9404 100755 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -4,6 +4,8 @@ * */ +$meta['logo'] = array('string'); + $meta['discussionPage'] = array('string'); $meta['userPage'] = array('string'); $meta['hideTools'] = array('onoff'); diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index bcbadcd..0b19a1d 100644 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -7,6 +7,7 @@ .nav-usertools { ul{ float: right; + padding: 0; margin: .2rem 0 0 0; li{ display: inline-block; float: right; diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index 662f7ab9d89e1646ca195c3bb5b993d099ae077d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5704 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 diff --git a/lang/de/lang.php b/lang/de/lang.php index 4479980..8145edc 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -5,20 +5,24 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ -$lang['direct_prefix'] = 'Direkt'; -$lang['direct_content_main'] = 'Hauptinhalt dieser Seite'; -$lang['direct_menu_main'] = 'Hauptmenü'; +$lang['direct_prefix'] = 'Direkt'; +$lang['direct_content_main'] = 'Hauptinhalt dieser Seite'; +$lang['direct_menu_main'] = 'Hauptmenü'; -$lang['nav-area-head'] = 'Navigationsmenüs und Suche'; -$lang['head_magic_matcher'] = 'MagicMatcher'; +$lang['adjunct_start_logo_text'] = 'Logo: '; +$lang['adjunct_linked_logo_text'] = '. Link zur Startseite'; +$lang['nav-area-head'] = 'Navigationsmenüs und Suche'; +$lang['head_magic_matcher'] = 'MagicMatcher'; +$lang['head_quick_search'] = 'wikiübergreifende Schnellsuche'; +$lang['head_menu_main'] = 'Hauptmenü'; -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Zurück zum Artikel'; -$lang['userpage'] = 'Benutzer-Seite'; -$lang['__existing__'] = 'The color for links to existing pages'; -$lang['__missing__'] = 'The color for links to non-existing pages'; -$lang['__site_width__'] = 'The width of the full site (can be any length unit: %, px, em, ...)'; -$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)'; +$lang['discussion'] = 'Diskussion'; +$lang['back_to_article'] = 'Zurück zum Artikel'; +$lang['userpage'] = 'Benutzer-Seite'; +$lang['__existing__'] = 'The color for links to existing pages'; +$lang['__missing__'] = 'The color for links to non-existing pages'; +$lang['__site_width__'] = 'The width of the full site (can be any length unit: %, px, em, ...)'; +$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)'; //Setup VIM: ex: et ts=2 : diff --git a/lang/en/lang.php b/lang/en/lang.php index a961924..6f81d58 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -4,17 +4,22 @@ * */ -$lang['direct_prefix'] = 'jump to'; -$lang['direct_content_main'] = 'main content'; -$lang['direct_menu_main'] = 'main menu'; +$lang['direct_prefix'] = 'jump to'; +$lang['direct_content_main'] = 'main content'; +$lang['direct_menu_main'] = 'main menu'; -$lang['nav-area-head'] = 'menus and quick search'; -$lang['head_magic_matcher'] = 'MagicMatcher'; +$lang['adjunct_start_logo_text'] = 'Logo: '; +$lang['adjunct_linked_logo_text'] = '. homepage link'; -$lang['discussion'] = 'Discussion'; -$lang['back_to_article'] = 'Back to article'; -$lang['userpage'] = 'User page'; -$lang['__existing__'] = 'The color for links to existing pages'; -$lang['__missing__'] = 'The color for links to non-existing pages'; -$lang['__site_width__'] = 'The width of the full site (can be any length unit: %, px, em, ...)'; -$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)'; +$lang['nav-area-head'] = 'menus and quick search'; +$lang['head_magic_matcher'] = 'MagicMatcher'; +$lang['head_quick_search'] = 'quick search'; +$lang['head_menu_main'] = 'main menu'; + +$lang['discussion'] = 'Discussion'; +$lang['back_to_article'] = 'Back to article'; +$lang['userpage'] = 'User page'; +$lang['__existing__'] = 'The color for links to existing pages'; +$lang['__missing__'] = 'The color for links to non-existing pages'; +$lang['__site_width__'] = 'The width of the full site (can be any length unit: %, px, em, ...)'; +$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)'; diff --git a/main.php b/main.php index fe464fc..a7f99ed 100755 --- a/main.php +++ b/main.php @@ -79,10 +79,13 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?> - - + + +
- -
-
-
- -
+
+ + + +

+ +
+
+
+
+ + +
+
+
+ + +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+
+
+ + + +
+
+
+
+ -
-
-
- -
-

- ','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?> - -

- + include('tpl/nav-usertools.php'); -
-
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* Include Hook: header.html */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + tpl_includeFile('header.html'); + ?> -
- - -
-

- -
    - tpl_action('recent', 1, 'li', 1), - 'media' => tpl_action('media', 1, 'li', 1), - 'index' => tpl_action('index', 1, 'li', 1), - )); ?> -
-
- -
-
- - - -
- - -
- - -
-
-
+ + + +
- - -
- - - -
-
- +
diff --git a/tpl/main-sidebar-logo.php b/tpl/main-sidebar-logo.php new file mode 100644 index 0000000..a47255f --- /dev/null +++ b/tpl/main-sidebar-logo.php @@ -0,0 +1,13 @@ +'; + + /* homepage logo should not link to itself (BITV accessibility requirement) */ + if (strcmp(wl(), $_SERVER['REQUEST_URI']) === 0 ){ + echo ''.tpl_getLang('adjunct_start_logo_text').$conf['title'].''; + } else{ + tpl_link( wl(),''.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'','accesskey="h" title="[H]"' ); + + } + echo "
"; diff --git a/tpl/main-sidebar-search.php b/tpl/main-sidebar-search.php new file mode 100644 index 0000000..2088c41 --- /dev/null +++ b/tpl/main-sidebar-search.php @@ -0,0 +1,5 @@ +'.tpl_getLang('head_quick_search').''; + + tpl_searchform(); diff --git a/tpl/nav-direct.php b/tpl/nav-direct.php index 3b3c74e..8bf91c0 100644 --- a/tpl/nav-direct.php +++ b/tpl/nav-direct.php @@ -10,9 +10,9 @@

: - / - / - + / + / +

diff --git a/tpl/nav-main.php b/tpl/nav-main.php new file mode 100644 index 0000000..0f62471 --- /dev/null +++ b/tpl/nav-main.php @@ -0,0 +1,7 @@ + + diff --git a/tpl/nav-sitetools.php b/tpl/nav-sitetools.php new file mode 100644 index 0000000..7bbc513 --- /dev/null +++ b/tpl/nav-sitetools.php @@ -0,0 +1,15 @@ + +