Thread: [Weberp-svn] SF.net SVN: weberp:[9466] trunk (Page 14)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9466
          http://weberp.svn.sourceforge.net/weberp/?rev=9466&view=rev
Author:   tim_schofield
Date:     2012-07-29 22:11:25 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Corrections to get help system to work correctly

Modified Paths:
--------------
    trunk/css/silverwolf/sub.css
    trunk/doc/Manual/ManualFooter.html
    trunk/doc/Manual/ManualGeneralLedger.html
    trunk/doc/Manual/ManualHeader.html
    trunk/doc/Manual/style/manual.css
    trunk/includes/header.inc
    trunk/index.php
    trunk/javascripts/FormFunctions.js

Modified: trunk/css/silverwolf/sub.css
===================================================================

--- trunk/css/silverwolf/sub.css	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/css/silverwolf/sub.css	2012-07-29 22:11:25 UTC (rev 9466)
@@ -99,12 +99,35 @@
 	right: 20%;
 	bottom: 25px;
 	left: 20%;
-	padding-left: 10px;
-	padding-right: 10px;
+	padding-left: 2px;
+	padding-right: 2px;
 	background: white;
 	color: black;
 	opacity: 0.99;
-	z-index: 4;
+	z-index: 6;
+	overflow:none;
+}
+
+div.manual_title_bar {
+	font-family: Ubuntu, Lucida Grande, Lucida Sans Unicode, Lucida Sans, Geneva, Verdana, sans-serif;
+	font-size: 24px;
+	border: solid #010066 2px;
+	color: #010066;
+	border-radius: 17px;
+	margin-top: 2px;
+	margin-left: 0px;
+	margin-right: 1px;
+	padding-left: 10px;
+}
+
+div.ManualContent {
+	background: #ffffff;
+	padding-right: 1%;
+	position: absolute;
+	top: 7%;
+	right: 1%;
+	bottom: 1%;
+	left: 1%;
 	overflow:auto;
 }
 
@@ -198,17 +221,6 @@
 	border-radius: 7px;
 }
 
-div.manual_title_bar {
-	font-family: Ubuntu, Lucida Grande, Lucida Sans Unicode, Lucida Sans, Geneva, Verdana, sans-serif;
-	font-size: 24px;
-	border: solid #545050 2px;
-	border-radius: 17px;
-	margin-top: 2px;
-	margin-left: 0px;
-	margin-right: 4px;
-	padding-left: 10px;
-}
-
 div.status_bar {
 	position: relative;
 	bottom:2px;
@@ -242,6 +254,16 @@
 	cursor: pointer;
 }
 
+div.help_exit {
+	border: 0px solid #ffffff;
+	float: right;
+	padding-top:0px;
+	padding-right:10px;
+	height: 100%;
+	color: #000000;
+	cursor: pointer;
+}
+
 div.centre {
 	border: 0px solid #ffffff;
 	margin: 0 auto;
@@ -405,9 +427,7 @@
 
 th.header {
 	font-weight: normal;
-	background: #90979B;
-	background: -moz-linear-gradient(left, #EEE7E7, #324D5D);
-	background: -webkit-linear-gradient(left, #EEE7E7, #324D5D);
+	background: #6C7072;
 	text-shadow: 1px 1px #324D5D;
 	border: solid #A49999 0px;
 	border-radius: 5px;

Modified: trunk/doc/Manual/ManualFooter.html
===================================================================
--- trunk/doc/Manual/ManualFooter.html	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/doc/Manual/ManualFooter.html	2012-07-29 22:11:25 UTC (rev 9466)
@@ -1,3 +1,4 @@
 <div class="right"><a id="bottom">&#160;</a><a class="minitext" href="#top">⬆ Go to Top</a></div>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/doc/Manual/ManualGeneralLedger.html	2012-07-29 22:11:25 UTC (rev 9466)
@@ -2,7 +2,8 @@
 
 <h2>Overview</h2>
 
-<p>The general ledger is the accounting hub that is central to the "sub" ledgers for creditors (Accounts Payable), debtors (Accounts Receivable) and stock (inventory). All entries in the sub ledgers are also represented by entries in the general ledger. It is the integration set-up that determines how entries in the sub-ledgers are reflected in the general ledger. Most activity in the general ledger will be automatically created from the activity in the sub-ledgers with receivables, payables and stock administration.</p><img class="manual" src="doc/Manual/images/GLIntegration.jpg">
+<p>The general ledger is the accounting hub that is central to the "sub" ledgers for creditors (Accounts Payable), debtors (Accounts Receivable) and stock (inventory). All entries in the sub ledgers are also represented by entries in the general ledger. It is the integration set-up that determines how entries in the sub-ledgers are reflected in the general ledger. Most activity in the general ledger will be automatically created from the activity in the sub-ledgers with receivables, payables and stock administration.</p>
+<img class="manual" src="doc/Manual/images/GLIntegration.jpg">
 <p>
 
 <p>However, there are also facilities to:</p>

Modified: trunk/doc/Manual/ManualHeader.html
===================================================================
--- trunk/doc/Manual/ManualHeader.html	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/doc/Manual/ManualHeader.html	2012-07-29 22:11:25 UTC (rev 9466)
@@ -7,9 +7,10 @@
 </head>
 <body>
 
-  <div class="manual_title_bar"><b><?php echo $ProjectName; ?> Manual </b>
-  <div onClick="CloseHelpWindow()" class="exit" title="Close the manual">X</div>
+<div class="manual_title_bar"><b><?php echo $ProjectName; ?> Manual </b>
+	<div onClick="CloseHelpWindow()" class="help_exit" title="Close the manual">X</div>
 </div>
+  <div class="ManualContent" id="ManualContents">
   <div class="right">
     <a id="top">&#160;</a><a class="minitext" href="<?php echo $rootpath; ?>/ManualContents.php">☜ Table of Contents</a>
     <br />

Modified: trunk/doc/Manual/style/manual.css
===================================================================
--- trunk/doc/Manual/style/manual.css	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/doc/Manual/style/manual.css	2012-07-29 22:11:25 UTC (rev 9466)
@@ -36,26 +36,34 @@
 }
 h1 {
     padding-top: 10px;
-    color: #0033cc;
+    color: #021C6A;
 	font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-	font-size: 100%;
+	font-size: 2em;
 }
-h2 { }
+h2 {
+	padding-top: 10px;
+    color: #021C6A;
+	font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+	font-size: 1.5em;
+}
 h3 { }
 h4 { }
 
+img.manual {
+	width: 100%;
+}
 
 a {
-
 	text-decoration: none;
-	border-bottom: 1px dotted #0033cc;
+	border-bottom: 1px dotted #021C6A;
+	color: #021C6A;
 	padding:0;
 	margin:0;
 }
 
 a:hover {
 	background:#fff;
-	color: #0033cc;
+	color: #021C6A;
 }
 .right {
     text-align:right;

Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/includes/header.inc	2012-07-29 22:11:25 UTC (rev 9466)
@@ -35,16 +35,16 @@
 
 echo '<body>';
 
-$DefaultManualLink = $rootpath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark;
+$DefaultManualLink = 'doc/Manual/ManualContents.php'. $ViewTopic . $BookMark;
 
 if (mb_substr($_SESSION['Language'],0,2) !='en' and file_exists('locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php')){
-	$DeafaulManualLink='locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php';
+	$DefaultManualLink='locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php';
 }
 
 echo '<div class="title_bar">';
 echo $ProjectName . ' - ' . $title;
 echo '<div onClick="CloseSubWindow()" class="exit" title="Close this form">X</div>';
-echo '<div onClick="OpenHelpWindow(\''.$DefaultManualLink.'\'); " class="exit" title="Show help for this function">?</div>';
+echo '<div onClick="OpenHelpWindow(\''.$DefaultManualLink.'\', \''.$BookMark.'\'); " class="exit" title="Show help for this function">?</div>';
 if (isset($_SESSION['History']) and sizeOf($_SESSION['History'])>0) {
 	if (strstr($_SESSION['History'][sizeOf($_SESSION['History'])-1], '?')) {
 //		echo '<div class="exit">'.InternalLink('',$_SESSION['History'][sizeOf($_SESSION['History'])-1].'&Back=True', html_entity_decode('<'), 'BackButton', _('Return to previous page')) . '</div>';

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/index.php	2012-07-29 22:11:25 UTC (rev 9466)
@@ -7,6 +7,7 @@
 include('includes/main_header.inc');
 
 echo '<button onclick="showMenu(this)" class="menuButton">Show Menu</button>';
+echo '<div id="HelpWindow"></div>';
 
 echo '<div id="Mask"></div>';
 echo '<div id="SubWindow"><div id="contents"></div></div>';

Modified: trunk/javascripts/FormFunctions.js
===================================================================
--- trunk/javascripts/FormFunctions.js	2012-07-29 07:45:45 UTC (rev 9465)
+++ trunk/javascripts/FormFunctions.js	2012-07-29 22:11:25 UTC (rev 9466)
@@ -202,9 +202,10 @@
 	return false;
 }
 
-function OpenHelpWindow(TargetURL) {
-	document.getElementById("Mask").style.zIndex=3;
+function OpenHelpWindow(TargetURL, BookMark) {
+	document.getElementById("Mask").style.zIndex=4;
 	document.getElementById("HelpWindow").setAttribute("class", "helpbox");
+	document.getElementById("HelpWindow").style.zIndex=9;
 	if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari
 		xmlhttp=new XMLHttpRequest();
 	} else {// code for IE6, IE5
@@ -217,7 +218,7 @@
 	}
 	xmlhttp.open("GET",TargetURL,true);
 	xmlhttp.send();
-	HelpWindow.location.hash = "#AccountGroups";
+	document.location = "index.php"+BookMark;
 	return false;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Weberp-svn] SF.net SVN: weberp:[9466] trunk (Page 14)

weberp-svn