Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7745] trunk
|
From: <rc...@us...> - 2017-03-29 23:52:45
|
Revision: 7745
http://sourceforge.net/p/web-erp/reponame/7745
Author: rchacon
Date: 2017-03-29 23:52:43 +0000 (Wed, 29 Mar 2017)
Log Message:
-----------
Fix checkbox showing and do some improvements.
Modified Paths:
--------------
trunk/ManualContents.php
trunk/doc/Change.log
trunk/doc/Manual/style/manual.css
Modified: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php 2017-03-29 15:43:41 UTC (rev 7744)
+++ trunk/ManualContents.php 2017-03-29 23:52:43 UTC (rev 7745)
@@ -35,10 +35,8 @@
$ManualOutline = 'doc/Manual/ManualOutline.php';
}
-
-// Begin old code ==============================================================
ob_start();
-$PathPrefix = '../../';
+/*$PathPrefix = '../../';*/
// Output the header part:
$ManualHeader = 'locale/' . $Language . '/Manual/ManualHeader.html';
@@ -65,56 +63,49 @@
$_GET['ViewTopic'] = isset($_GET['ViewTopic']) ? $_GET['ViewTopic'] : '';
//all sections of manual listed here
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" class="noPrint">';
-
if(((!isset($_POST['Submit'])) and (empty($_GET['ViewTopic']))) || ((isset($_POST['Submit'])) and (isset($_POST['SelectTableOfContents'])))) {
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">';
// if not submittws then coming into manual to look at TOC
// if SelectTableOfContents set then user wants it displayed
if(!isset($_POST['Submit'])) {
- echo '<p>Click on a link to view a page, or<br />
- Check boxes and click on Display Checked to view selected in one page
- <input type="submit" name="Submit" value="Display Checked" />
- </p>';
+ echo '<p>', _('Click on a link to view a page, or check boxes and click on "Display Checked" to view selected in one page'), '</p>';
+ echo '<p><input type="submit" name="Submit" value="', _('Display Checked'), '" /></p>';
}
- echo "<ul>\n<li style=\"list-style-type:none;\">\n<h1>";
+ echo '<h1>';
if(!isset($_POST['Submit'])) {
- echo ' <input type="checkbox" name="SelectTableOfContents">';
+ echo '<input name="SelectTableOfContents" type="checkbox">';
}
- echo _('Table of Contents'), "</h1></li>\n";
+ echo _('Table of Contents'), '</h1>';
$j = 0;
foreach($TOC_Array['TableOfContents'] as $Title => $SubLinks) {
$Name = 'Select' . $Title;
- echo "<ul>\n";
+ echo '<ul>
+ <li class="toc"';
+ // List topic title:
if(!isset($_POST['Submit'])) {
- echo '<li class="toc" style="list-style-type:none;"><input type="checkbox" name="' . $Name . '">' . "\n";
- echo '<section style="margin-bottom:5px;">
- <div class="roundedOne">
- <input type="checkbox" value="None" id="roundedOne'.$j.'" name="' . $Name . '" />
- <label for="roundedOne'.$j.'"></label>';
-
- echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ViewTopic=' . $Title . '" style="padding-left:1%";>' . $SubLinks[0] . '</a></li>' . "\n";
-
- echo '</div>
- </section>';
- } else {
- echo ' <li class="toc"><a href="#' . $Title . '">' . $SubLinks[0] . '</a></li>' . "\n";
+ echo ' style="list-style-type:none;"><input id="roundedOne', $j, '" name="', $Name, '" type="checkbox" value="None" /';
}
+ echo '>
+ <a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?ViewTopic=', $Title, '">', $SubLinks[0], '</a></li>';
+ // List topic content:
if(count($SubLinks) > 1) {
- echo '<ul>' . "\n";
+ echo '<ul>';
foreach($SubLinks as $k => $SubName) {
- if($k == 0)
+ if($k == 0) {// Skip first array element $SubLinks[0].
continue;
- echo '<li>' . $SubName . '</li>' . "\n";
+ }
+ echo '<li>', $SubName, '</li>';
}
- echo '</ul>' . "\n";
+ echo '</ul>';
}
- echo '</ul>' . "\n";
+
+ echo '</ul>';
++$j;
}
- echo '</ul>' . "\n";
+ echo '</ul>',
+ '<p><input type="submit" name="Submit" value="', _('Display Checked'), '" /></p>',
+ '</form>';
}
-echo '</form>' . "\n";
if(!isset($_GET['ViewTopic'])) {
$_GET['ViewTopic'] = '';
@@ -151,8 +142,5 @@
}
ob_end_flush();
-// End old code ================================================================
-
-
// END: Procedure division -----------------------------------------------------
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-03-29 15:43:41 UTC (rev 7744)
+++ trunk/doc/Change.log 2017-03-29 23:52:43 UTC (rev 7745)
@@ -1,5 +1,6 @@
webERP Change Log
+30/3/17 RChacon: In ManualContents.php, fix checkbox showing and do some improvements.
29/3/17 RChacon: In webERP manual, allow to use default pages if locale pages do not exist.
26/3/17 Abel World: Make degine $ReportList as an array to comply with PHP 7.
19/3/17 RChacon: Rename AccountSectionsDef.inc to AccountSectionsDef.php.
Modified: trunk/doc/Manual/style/manual.css
===================================================================
--- trunk/doc/Manual/style/manual.css 2017-03-29 15:43:41 UTC (rev 7744)
+++ trunk/doc/Manual/style/manual.css 2017-03-29 23:52:43 UTC (rev 7745)
@@ -1,3 +1,4 @@
+/* $Id: manual.css 7643 2016-10-07 15:28:49Z daintree $ */
/*
* manual.css used with the webERP manual
* http://web-erp.sourceforge.net
@@ -113,10 +114,10 @@
li.toc {
color:#03c;
}
-
+/*
input[type=checkbox] {
visibility:hidden;
-}
+}*/
p {
margin-left:2%;
@@ -124,4 +125,9 @@
}
pre {
font-size: 1.2em;
-}
\ No newline at end of file
+}
+
+.noprint {
+ display:none;
+ /* Remove unwanted elements. */
+}
|
