[Xfce4-commits] [www/wiki.xfce.org] 01/01: Start using CSS from the centralized stylesheets.
noreply at xfce.org
noreply at xfce.org
Mon Jun 12 23:11:16 CEST 2017
This is an automated email from the git hooks/post-receive script.
k n o m e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository www/wiki.xfce.org.
commit 137c2b06c8b9f95100e6b63ce5f07a4680b61774
Author: Pasi Lallinaho <pasi at shimmerproject.org>
Date: Tue Jun 13 00:06:08 2017 +0300
Start using CSS from the centralized stylesheets.
---
lib/tpl/xfce/main.php | 121 +++++++++++++++++++++-----------------------
lib/tpl/xfce/style.ini | 4 +-
lib/tpl/xfce/tpl_header.php | 65 ++++++++++--------------
3 files changed, 88 insertions(+), 102 deletions(-)
diff --git a/lib/tpl/xfce/main.php b/lib/tpl/xfce/main.php
index 3721d31..264ba26 100644
--- a/lib/tpl/xfce/main.php
+++ b/lib/tpl/xfce/main.php
@@ -23,6 +23,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
<?php tpl_includeFile('meta.html') ?>
+ <link rel="stylesheet" media="screen" href="https://www.xfce.org/style/css.php?site=wiki" type="text/css" />
</head>
<body>
@@ -37,73 +38,69 @@ else if (strstr(DOKU_URL, "docs.xfce.org")) {
else {
tpl_includeFile('xfce-header.html');
}
-?>
+?>
<!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
- <div id="dokuwiki__site"><div id="dokuwiki__top"
- class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'showSidebar' : '';
- ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
-
- <?php include('tpl_header.php') ?>
-
- <div class="wrapper group">
-
- <?php if($showSidebar): ?>
- <!-- ********** ASIDE ********** -->
- <div id="dokuwiki__aside"><div class="pad include group">
- <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
- <div class="content">
- <?php tpl_flush() ?>
- <?php tpl_includeFile('sidebarheader.html') ?>
- <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
- <?php tpl_includeFile('sidebarfooter.html') ?>
- </div>
- </div></div><!-- /aside -->
- <?php endif; ?>
-
- <!-- ********** CONTENT ********** -->
- <div id="dokuwiki__content"><div class="pad group">
-
- <div class="page group">
- <?php tpl_flush() ?>
- <?php tpl_includeFile('pageheader.html') ?>
- <!-- wikipage start -->
- <?php tpl_content() ?>
- <!-- wikipage stop -->
- <?php tpl_includeFile('pagefooter.html') ?>
- </div>
-
- <div class="docInfo"><?php tpl_pageinfo() ?></div>
-
- <?php tpl_flush() ?>
- </div></div><!-- /content -->
-
- <hr class="a11y" />
-
- <!-- PAGE ACTIONS -->
- <div id="dokuwiki__pagetools">
- <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
- <div class="tools">
- <ul>
- <?php
- tpl_action('edit', 1, 'li', 0, '<span>', '</span>');
- tpl_action('revert', 1, 'li', 0, '<span>', '</span>');
- tpl_action('revisions', 1, 'li', 0, '<span>', '</span>');
- tpl_action('backlink', 1, 'li', 0, '<span>', '</span>');
- tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>');
- tpl_action('media', 1, 'li', 0, '<span>', '</span>');
- tpl_action('top', 1, 'li', 0, '<span>', '</span>');
- ?>
- </ul>
- </div>
- </div>
- </div><!-- /wrapper -->
- <?php include('tpl_footer.php') ?>
- </div></div><!-- /site -->
+ <?php include('tpl_header.php') ?>
+
+ <div id="dokuwiki__top"></div>
+ <div id="main" class="dokuwiki site mode_<?php echo $ACT ?>">
+
+ <div id="content">
+ <div id="article" class="page group">
+ <?php html_msgarea() ?>
+
+ <?php tpl_flush() ?>
+ <?php tpl_includeFile('pageheader.html') ?>
+ <!-- wikipage start -->
+ <?php tpl_content(false) ?>
+ <!-- wikipage stop -->
+ <?php tpl_includeFile('pagefooter.html') ?>
+ <?php tpl_flush() ?>
+ </div>
+ <!-- In order to be able to use :empty, we will need to keep the following and the closing if tag and div tags on the same line -->
+ <div id="related">
+ <?php tpl_toc() ?>
+
+ <h2>Tools</h2>
+ <p><?php tpl_searchform(); ?></p>
+
+ <ul>
+ <?php
+ tpl_action('edit', 1, 'li', 0, '<span>', '</span>');
+ tpl_action('revert', 1, 'li', 0, '<span>', '</span>');
+ tpl_action('revisions', 1, 'li', 0, '<span>', '</span>');
+ tpl_action('backlink', 1, 'li', 0, '<span>', '</span>');
+ tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>');
+ tpl_action('media', 1, 'li', 0, '<span>', '</span>');
+ tpl_action('top', 1, 'li', 0, '<span>', '</span>');
+ ?>
+ </ul>
+
+
+ <!-- ********** ASIDE ********** -->
+ <?php if($showSidebar): ?>
+ <div id="dokuwiki__aside"><div class="pad include group">
+ <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
+ <div class="content">
+ <?php tpl_flush() ?>
+ <?php tpl_includeFile('sidebarheader.html') ?>
+ <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
+ <?php tpl_includeFile('sidebarfooter.html') ?>
+ </div>
+ </div></div><!-- /aside -->
+ <?php endif; ?></div>
+ </div>
+
+ </div>
+ <div id="footer" class="main_width">
+ <?php include('tpl_footer.php') ?>
+ </div>
+<!-- <hr class="a11y" /> -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
<div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
- <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
+ <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
</body>
</html>
diff --git a/lib/tpl/xfce/style.ini b/lib/tpl/xfce/style.ini
index 2aafbfb..fa097ef 100644
--- a/lib/tpl/xfce/style.ini
+++ b/lib/tpl/xfce/style.ini
@@ -12,7 +12,7 @@
[stylesheets]
-css/basic.css = screen
+#css/basic.css = screen
css/_imgdetail.css = screen
css/_media_popup.css = screen
css/_media_fullscreen.css = screen
@@ -34,7 +34,7 @@ css/pagetools.css = screen
css/content.css = screen
css/includes.css = screen
css/_translation.css = all
-_xfceheader.css = screen
+; _xfceheader.css = screen
css/mobile.css = all
css/print.css = print
diff --git a/lib/tpl/xfce/tpl_header.php b/lib/tpl/xfce/tpl_header.php
index a634a26..1cd43a8 100644
--- a/lib/tpl/xfce/tpl_header.php
+++ b/lib/tpl/xfce/tpl_header.php
@@ -8,42 +8,31 @@ if (!defined('DOKU_INC')) die();
?>
<!-- ********** HEADER ********** -->
-<div id="dokuwiki__header"><div class="pad group">
-
- <?php tpl_includeFile('header.html') ?>
-
- <div class="tools group">
-
- <div id="dokuwiki__sitetools">
- <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3>
-
- <?php $translation = &plugin_load('helper','translation'); ?>
- <?php if ($translation != NULL) : ?>
- <div class="translation">
- <?php echo $translation->showTranslations(); ?>
- </div>
- <?php endif ?>
- <?php tpl_searchform(); ?>
- <div class="mobileTools">
- <?php tpl_actiondropdown($lang['tools']); ?>
- </div>
-
- <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?>
- <div class="breadcrumbs">
- <?php if($conf['youarehere']): ?>
- <div class="youarehere"><?php tpl_youarehere() ?></div>
- <?php endif ?>
- <?php if($conf['breadcrumbs']): ?>
- <div class="trace"><?php tpl_breadcrumbs() ?></div>
- <?php endif ?>
- </div>
- <?php endif ?>
-
- </div>
-
- </div>
-
- <?php html_msgarea() ?>
-
- <hr class="a11y" />
+<div id="header" class="main_width"><div class="pad group">
+ <?php tpl_includeFile('header.html') ?>
+
+ <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?>
+ <div class="breadcrumbs">
+ <?php if($conf['youarehere']): ?>
+ <div class="youarehere"><?php tpl_youarehere() ?></div>
+ <?php endif ?>
+ <?php if($conf['breadcrumbs']): ?>
+ <div class="trace"><?php tpl_breadcrumbs() ?></div>
+ <?php endif ?>
+ </div>
+ <?php endif ?>
+
+ <div class="tools">
+ <div class="mobileTools">
+ <?php tpl_actiondropdown($lang['tools']); ?>
+ </div>
+ <?php $translation = &plugin_load('helper','translation'); ?>
+ <?php if ($translation != NULL) : ?>
+ <div class="translation">
+ <?php echo $translation->showTranslations(); ?>
+ </div>
+ <?php endif ?>
+ </div>
+
+ <hr class="a11y" />
</div></div><!-- /header -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list