diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-03-23 23:58:44 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-03-23 23:58:44 +0000 |
| commit | 57fc5eddedf96b52f76700b70686359a594b2031 (patch) | |
| tree | 7fdd8b4fdb447f1836a72d2edbd603a889e385bc /lib | |
| parent | a4ffa98be918b511b2a80d03d5ce147dc1cef0b7 (diff) | |
| download | rpg-57fc5eddedf96b52f76700b70686359a594b2031.tar.gz rpg-57fc5eddedf96b52f76700b70686359a594b2031.tar.bz2 | |
removed a few comments in new template files
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tpl/dokuwiki/detail.php | 9 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 15 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/tpl_header.php | 7 |
3 files changed, 7 insertions, 24 deletions
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 287827253..90ae492bd 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -30,14 +30,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show </head> <body> - <?php /* with these Conditional Comments you can better address IE issues in CSS files, - precede CSS rules by #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?> <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> - - <?php /* the "dokuwiki__top" id is needed somewhere at the top, because that's where the "back to top" button/link links to */ ?> - <?php /* classes mode_<action> are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> - <?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?> <div id="dokuwiki__site"><div id="dokuwiki__top" class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> @@ -53,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php endif; ?> <div class="page group"> - <?php tpl_flush() /* flush the output buffer */ ?> + <?php tpl_flush() ?> <?php _tpl_include('pageheader.html') ?> <!-- detail start --> <?php diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 84334a4db..44a8d4a19 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -27,14 +27,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show </head> <body> - <?php /* with these Conditional Comments you can better address IE issues in CSS files, - precede CSS rules by #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?> <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> - - <?php /* the "dokuwiki__top" id is needed somewhere at the top, because that's where the "back to top" button/link links to */ ?> - <?php /* classes mode_<action> are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> - <?php /* .dokuwiki should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?> <div id="dokuwiki__site"><div id="dokuwiki__top" class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> @@ -45,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> - <?php tpl_flush() /* flush the output buffer */ ?> + <?php tpl_flush() ?> <?php _tpl_include('sidebarheader.html') ?> - <?php tpl_include_page($conf['sidebar']) /* includes the given wiki page */ ?> + <?php tpl_include_page($conf['sidebar']) ?> <?php _tpl_include('sidebarfooter.html') ?> </div></div><!-- /aside --> <?php endif; ?> @@ -61,12 +54,12 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_flush() ?> <?php _tpl_include('pageheader.html') ?> <!-- wikipage start --> - <?php tpl_content() /* the main content */ ?> + <?php tpl_content() ?> <!-- wikipage stop --> <?php _tpl_include('pagefooter.html') ?> </div> - <div class="docInfo"><?php tpl_pageinfo() /* 'Last modified' etc */ ?></div> + <div class="docInfo"><?php tpl_pageinfo() ?></div> <?php tpl_flush() ?> </div></div><!-- /content --> diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 91d8876b9..9a391aedc 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -1,7 +1,7 @@ <!-- ********** HEADER ********** --> <div id="dokuwiki__header"><div class="pad group"> - <?php html_msgarea() /* occasional error and info messages on top of the page */ ?> + <?php html_msgarea() ?> <?php _tpl_include('header.html') ?> <div class="headings group"> @@ -12,7 +12,7 @@ <h1><?php // get logo either out of the template images folder or data/media folder $logoSize = array(); - $logo = tpl_getMediaFile(array(':wiki:logo.png','images/logo.png'),false,$logoSize); + $logo = tpl_getMediaFile(array(':wiki:logo.png', 'images/logo.png'), false, $logoSize); // display logo and wiki title in a link to the home page tpl_link( @@ -32,8 +32,6 @@ <div id="dokuwiki__usertools"> <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3> <ul> - <?php /* the optional second parameter of tpl_action() switches between a link and a button, - e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */ if ($_SERVER['REMOTE_USER']) { echo '<li class="user">'; tpl_userinfo(); /* 'Logged in as ...' */ @@ -52,7 +50,6 @@ <div id="dokuwiki__sitetools"> <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3> <?php tpl_searchform(); ?> - <?php /* all the tools in one dropdown (good for mobile view): */ ?> <div class="mobileTools"> <?php tpl_actiondropdown($lang['tools']); ?> </div> |