cs-project-svn_notify Mailing List for CS-Project (Page 9)
Brought to you by:
crazedsanity
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(47) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(34) |
Feb
(82) |
Mar
(21) |
Apr
(12) |
May
(16) |
Jun
|
Jul
(6) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(1) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(5) |
Sep
(12) |
Oct
(11) |
Nov
(4) |
Dec
(15) |
2010 |
Jan
|
Feb
|
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(9) |
2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: <cra...@us...> - 2008-02-14 08:24:41
|
Revision: 841 http://cs-project.svn.sourceforge.net/cs-project/?rev=841&view=rev Author: crazedsanity Date: 2008-02-14 00:24:34 -0800 (Thu, 14 Feb 2008) Log Message: ----------- Remove option for converting database (part of which was included in the last commit). Modified Paths: -------------- trunk/1.2/templates/setup/4.content.tmpl Modified: trunk/1.2/templates/setup/4.content.tmpl =================================================================== --- trunk/1.2/templates/setup/4.content.tmpl 2008-02-14 08:23:49 UTC (rev 840) +++ trunk/1.2/templates/setup/4.content.tmpl 2008-02-14 08:24:34 UTC (rev 841) @@ -6,110 +6,65 @@ </p> + + <form method="POST" onSubmit="new Effect.DropOut('submitButton');"> -<table border=1 cellpadding=3 cellspacing=0> +<a name="config" /> +<table border="1" cellpadding="3" cellspacing="0" width="80%"> +<tr> + <th colspan="2">Config Settings</th> +</tr> +<tr> + <td colspan="2" align="center"> + <div class="note" style="width:60em"><b>NOTE:</b> You should be <font color="red"><b>absolutely certain</b></font> of the + effects of the changes you make here. Changing an item to an incorrect value make render the + installation useless. To rectify a broken configuration, you would need to modify the + <b>/lib/config.xml</b> file manually.</div> + </td> +</tr> +<tr> + <th width="80%">Name/Description</th> + <th width="20%">Value/Select Option</th> +</tr> +<!-- BEGIN setting_text --> <tr> - <th>Is Development Site?</th> <td> - <SELECT name="fields[isdevsite]"> - <option value="0" {isdevsite__0__checked}>0 (False)</option> - <option value="1" {isdevsite__1__checked}>1 (True)</option> - </SELECT> + <b>%%title%%</b> (%%index%%)<BR> + %%description%% </td> - <td>Whether it's a development site for cs-project or not... (TODO: add more info here)</td> + + <td><input name="fields[%%index%%]" type="text" value="%%value%%" %%disabled%%></td> </tr> - +<!-- END setting_text --> +<!-- BEGIN setting_select --> <tr> - <th>Project Name</th> - <td><input type="text" name="fields[proj_name]" value="{proj_name}" size="40"></td> - <td>Displayed name of the project (like "CS-Project")</td> - </tr> - - <tr> - <th>Project URL</th> - <td><input type="text" name="fields[project_url]" value="{project_url}" size="40"></td> - <td>Generally it's this website: ( <i>http://{currentUrl}</i> ).</td> - </tr> - - <tr> - <th nowrap>Helpdesk Issue Announce Email</th> - <td><input type="text" name="fields[helpdesk_issue_announce_email]" value="{helpdesk_issue_announce_email}" size="40"></td> - <td>This would be something like "<i>new...@yo...</i>"</td> - </tr> - - <tr> - <th nowrap>Mail Server IP</th> <td> - <input type="text" name="fields[phpmailer_host]" value="{phpmailer_host}" size="40"> - <input type="HIDDEN" name="fields[phpmailer_method]" value="IsSMTP"> + <b>%%title%%</b> (%%index%%)<BR> + %%description%% </td> - <td>This should be the IP of your mailserver, like <i>127.0.0.1</i>...</td> - </tr> - - - <tr> - <th>Maximum Session Length</th> - <td><input type="text" name="fields[max_time]" value="{max_time}" size="10"></td> - <td>This is how long any single session can be open before it's automatically removed from the server.</td> - </tr> - - <tr> - <th>Maximum Idleness</th> - <td><input type="text" name="fields[max_idle]" value="{max_idle}" size="10"></td> - <td>How long a session can be idle (no page views/activities) before it is removed.</td> - </tr> - - <tr> - <th>Session Name</th> - <td><input type="text" name="fields[config_session_name]" value="{config_session_name}" size="40"></td> - <td>Name of the session: really, this only matters if you have other websites running under the same - domain using PHP sessions, in which case this should be unique to avoid random annoying issues.</td> - </tr> - - - <tr> - <th>Stop Logins on Global Alert</th> - <td><SELECT name="fields[stop_logins_on_global_alert]"> - <option value="0" {stop_logins_on_global_alert__0__checked}>0 (off)</option> - <option value="1" {stop_logins_on_global_alert__1__checked}>1 (on)</option> - </SELECT></td> - <td>(<font color="red"><b>Currently unimplemented</b></font>) Stop users from logging in if a global alert has been created.</td> - </tr> - - - <tr> - <th>Debug Printing?</th> - <td><SELECT name="fields[debugprintopt]"> - <option value="0" {debugprintopt__0__checked}>0 (off)</option> - <option value="1" {debugprintopt__1__checked}>1 (on)</option> - </SELECT> + + <td> + <select name="fields[%%index%%]" %%disabled%%> + %%setting_select__normal%% + </select> </td> - <td>Generally, this should only be turned on if you're running a development site for cs-project...</td> </tr> - - +<!-- END setting_select --> +<!-- BEGIN setting_locked --> <tr> - <th>Debug Print: Add "HR" Tag?</th> - <td><SELECT name="fields[debugremovehr]"> - <option value="0" {debugremovehr__0__checked}>0 (no separator)</option> - <option value="1" {debugremovehr__1__checked}>1 (add separator)</option> - </SELECT> + <td> + <b>%%title%%</b> (%%index%%)<BR> + %%description%% </td> - <td>This setting affects whether or not there are separators between debug_print()'s (useful to discover if there's a print occurring that is otherwise not visible)</td> + + <td> + <!-- NOTE: should we even have hidden elements in the form? --> + <input type="text" name="fields[%%index%%]" value="%%value%%" disabled> + </td> </tr> - - - <tr> - <th>Working On It?</th> - <td>0 (no)<input type="HIDDEN" name="fields[workingonit]" value="0"></td> - <td><font color="red"><b><blink>WARNING!</blink></b></font> Setting this to a non-zero value - will DISABLE all connections to the database, and make your site unuseable. It is provided as - a simple, fast way to stop connections to your database, usually for maintenance purposes. It - is displayed here for reference only.</td> - </tr> +<!-- END setting_locked --> - <tr> <td colspan="3" align="center"><input id="submitButton" type="submit" value="Go to next step"><td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-14 08:23:51
|
Revision: 840 http://cs-project.svn.sourceforge.net/cs-project/?rev=840&view=rev Author: crazedsanity Date: 2008-02-14 00:23:49 -0800 (Thu, 14 Feb 2008) Log Message: ----------- More changes to make setup use config{}... PROBLEMS ENCOUNTERED::: 1.) ALL options show, including previously answered items 2.) Default values displayed instead of logically set ones (like project URL) 3.) user-defined values not stored when returning to step 4 4.) at the end of the run (step #5), system redirects before running tests, since the config already exists... (probably check for a session var in that test, instead of just checkng for the config file). Modified Paths: -------------- trunk/1.2/includes/setup/4.inc trunk/1.2/lib/config.class.php trunk/1.2/lib/site_config.php trunk/1.2/lib/upgradeClass.php Modified: trunk/1.2/includes/setup/4.inc =================================================================== --- trunk/1.2/includes/setup/4.inc 2008-02-14 07:58:02 UTC (rev 839) +++ trunk/1.2/includes/setup/4.inc 2008-02-14 08:23:49 UTC (rev 840) @@ -9,15 +9,15 @@ $defaultValues = array( 'isdevsite' => array(1, 'numeric', 0), 'proj_name' => array(10, 'sql', "CS-Project"), - 'project_url' => array(5, 'sql', $_SERVER['HTTP_HOST']), + 'project_url' => array(5, 'sql', $_SERVER['HTTP_HOST']), 'helpdesk_issue_announce_email' => array(7, 'email', "new...@yo..."), - 'max_time' => array(5, 'sql', "18 hours"), - 'max_idle' => array(5, 'sql', "2 hours"), - 'config_session_name' => array(9, 'alpha', "CS_PROJECT_SESSID"), - 'stop_logins_on_global_alert' => array(1, 'numeric', 1), + 'max_time' => array(5, 'sql', "18 hours"), + 'max_idle' => array(5, 'sql', "2 hours"), + 'config_session_name' => array(9, 'alpha', "CS_PROJECT_SESSID"), + 'stop_logins_on_global_alert' => array(1, 'numeric', 1), 'debugprintopt' => array(1, 'numeric', 0), 'debugremovehr' => array(1, 'numeric', 0), - 'workingonit' => array(1, 'numeric', 0) + 'workingonit' => array(1, 'numeric', 0) ); @@ -60,15 +60,18 @@ } } - foreach($priorSetupData as $index=>$value) { - //check if it's a yes/no type thing. - if(is_numeric($defaultValues[$index])) { - $index .= "__". $value ."__checked"; - $value = "selected"; - } - $page->add_template_var($index, $value); - } + $configObj = new config(); + $configObj->build_update_interface($page); + #foreach($priorSetupData as $index=>$value) { + # //check if it's a yes/no type thing. + # if(is_numeric($defaultValues[$index])) { + # $index .= "__". $value ."__checked"; + # $value = "selected"; + # } + # $page->add_template_var($index, $value); + #} + $page->add_template_var("currentUrl", $_SERVER['HTTP_HOST']); } @@ -93,6 +96,9 @@ $retval = __FUNCTION__ .": ". $index ." failed minimum length check after cleaning"; } } + elseif($index == 'workingonit') { + $goodValues++; + } else { $retval = __FUNCTION__ .": ". $index ." contains invalid data"; } Modified: trunk/1.2/lib/config.class.php =================================================================== --- trunk/1.2/lib/config.class.php 2008-02-14 07:58:02 UTC (rev 839) +++ trunk/1.2/lib/config.class.php 2008-02-14 08:23:49 UTC (rev 840) @@ -113,10 +113,12 @@ $parsedRows = ""; $defaultRowName = 'setting_text'; foreach($systemData as $indexName=>$defaultValue) { - $value = NULL; if(is_array($myData) && isset($myData[$indexName])) { $value = $myData[$indexName]; } + else { + $value = $systemData[$indexName]['value']; + } $attributes = $systemData[$indexName]['attributes']; $indexName = strtolower($indexName); @@ -139,7 +141,10 @@ } if(!isset($page->templateRows[$rowName])) { - throw new exception(__METHOD__ .": failed to retrieve block row named (". $rowName .")"); + $page->set_block_row('content', $rowName); + if(!isset($page->templateRows[$rowName])) { + throw new exception(__METHOD__ .": failed to retrieve block row named (". $rowName .")"); + } } //now parse stuff into the row... Modified: trunk/1.2/lib/site_config.php =================================================================== --- trunk/1.2/lib/site_config.php 2008-02-14 07:58:02 UTC (rev 839) +++ trunk/1.2/lib/site_config.php 2008-02-14 08:23:49 UTC (rev 840) @@ -63,14 +63,14 @@ //########################################################################## -$config = new config(dirname(__FILE__) .'/'. CONFIG_FILENAME, FALSE); -$config->read_config_file(TRUE, TRUE); +$configObj = new config(dirname(__FILE__) .'/'. CONFIG_FILENAME, FALSE); +$configObj->read_config_file(TRUE, TRUE); check_external_lib_versions(); if(!defined("PROJECT__INITIALSETUP") || PROJECT__INITIALSETUP !== TRUE) { - $config = read_config_file(FALSE); + $config = $configObj->read_config_file(FALSE); if(($config['WORKINGONIT'] != "0" && strlen($config['WORKINGONIT'])) || strlen($config['WORKINGONIT']) > 1) { //TODO: consider making this look prettier... @@ -93,7 +93,7 @@ else { $upgrade->check_versions(); } - read_config_file(TRUE); + $configObj->read_config_file(TRUE); } } Modified: trunk/1.2/lib/upgradeClass.php =================================================================== --- trunk/1.2/lib/upgradeClass.php 2008-02-14 07:58:02 UTC (rev 839) +++ trunk/1.2/lib/upgradeClass.php 2008-02-14 08:23:49 UTC (rev 840) @@ -141,7 +141,8 @@ //========================================================================= private function read_config_version() { - $config = read_config_file(FALSE); + $configObj = new config(); + $config = $configObj->read_config_file(FALSE); $this->mainConfig = $config; $retval = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-14 07:58:07
|
Revision: 839 http://cs-project.svn.sourceforge.net/cs-project/?rev=839&view=rev Author: crazedsanity Date: 2008-02-13 23:58:02 -0800 (Wed, 13 Feb 2008) Log Message: ----------- Beginning to convert setup to use new config::build_update_interface() to display page that builds the config.xml file. Modified Paths: -------------- trunk/1.2/includes/setup/3.inc trunk/1.2/includes/setup.inc trunk/1.2/lib/config.class.php trunk/1.2/lib/site_config.php trunk/1.2/templates/setup/3.content.tmpl Modified: trunk/1.2/includes/setup/3.inc =================================================================== --- trunk/1.2/includes/setup/3.inc 2008-02-14 07:05:11 UTC (rev 838) +++ trunk/1.2/includes/setup/3.inc 2008-02-14 07:58:02 UTC (rev 839) @@ -6,41 +6,23 @@ if($_POST) { - switch($_POST['selectedOption']) { - case 'convertExisting': { - store_setup_data(3, $_POST['fields'], 'convertExisting_post_info'); - $convertObj = new __convertDatabase(); - store_setup_data(3, $convertObj->go(), 'text'); - $convertObj->finish($page); - } - break; - - - case 'newInstall': { - $validSubmission = test_submitted_data($page, $_POST['users']); - if($validSubmission === TRUE) { - $obj = new __setupDefaultValues(); - store_setup_data(3, $obj->go(), 'text'); - $obj->finish($page); - } - else { - store_setup_data(3, $_POST['users'], 'post_info'); - $page->set_message_wrapper( - array( - 'title' => "Invalid User Data", - 'message' => "The user data you submitted appears to be invalid: <BR>\n". $validSubmission, - 'type' => "error" - ) - ); - $page->conditional_header("/setup/3", TRUE); - } - } - break; - - - default: - throw new exception("Invalid option selected!"); - }; + $validSubmission = test_submitted_data($page, $_POST['users']); + if($validSubmission === TRUE) { + $obj = new __setupDefaultValues(); + store_setup_data(3, $obj->go(), 'text'); + $obj->finish($page); + } + else { + store_setup_data(3, $_POST['users'], 'post_info'); + $page->set_message_wrapper( + array( + 'title' => "Invalid User Data", + 'message' => "The user data you submitted appears to be invalid: <BR>\n". $validSubmission, + 'type' => "error" + ) + ); + $page->conditional_header("/setup/3", TRUE); + } $page->conditional_header("/setup/3", TRUE); } @@ -58,14 +40,6 @@ } } } - - //now parse the "convertExisting" stuff... - $convertData = get_setup_data(3, 'convertExisting_post_info'); - if(is_array($convertData)) { - foreach($convertData as $userField => $userValue) { - $page->add_template_var($userField, $userValue); - } - } } @@ -1172,191 +1146,6 @@ -class __convertDatabase { - - - - private $db; - private $newDb; - private $gfObj; - - private $lastNumrows=NULL; - private $lastDberror=NULL; - - //========================================================================= - public function __construct() { - $this->db = new cs_phpDB; - - //retrieve the connection parameters. - $storedParams = get_setup_data(3, 'convertExisting_post_info'); - $params = array(); - foreach($storedParams as $index=>$value) { - $key = preg_replace('/^database__/', '', $index); - $params[$key] = $value; - } - $this->db->connect($params); - - $this->gfObj = new cs_globalFunctions; - $this->gfObj->debugPrintOpt=1; - - - $this->newDb = new cs_phpDb;; - $this->newDb->connect(get_db_params()); - }//end __construct() - //========================================================================= - - - //========================================================================= - public function go() { - //determine what script we have to include & run. - if(!$this->db->is_connected()) { - throw new exception(__METHOD__ .": failed to connect to database..."); - } - else { - $numrows = $this->db->exec("SELECT internal_data_get_value('version_string')"); - $dberror = $this->db->errorMsg(); - - if(!strlen($dberror) && $numrows == 1) { - $data = $this->db->farray(); - $version = $data[0]; - $this->run_conversion($version); - } - else { - throw new exception(__METHOD__ .": failed to get version... ". $dberror); - } - } - - }//end go() - //========================================================================= - - - - //========================================================================= - private function run_conversion($fromVersion) { - - //check if the script exists. - $convertScript = dirname(__FILE__) .'/../../upgrade/convert/'. $fromVersion .'.php'; - if(file_exists($convertScript)) { - require_once($convertScript); - try { - //create the object... - $obj = new convertDatabase($this->db, $this->newDb); - if(method_exists($obj, 'go')) { - $result = $obj->go(); - } - else { - throw new exception(__METHOD__ .": convertDatabase::go() does not exist"); - } - } - catch(exception $e) { - $this->gfObj->debug_print(__METHOD__ .": FATAL EXCEPTION OCCURRED::: ". $e->getMessage(),1); - } - } - else { - throw new exception(__METHOD__ .": conversion script does not exist: ". $convertScript); - } - }//end run_conversion() - //========================================================================= - - - - //========================================================================= - private function get_config_values() { - - store_setup_data(3, 0, 'result'); - $configData = array(); - //setup the list of required items. - $requiredItems = array( - 'log_category_table' => array( - 'prefix' => 'logcat', - 'idColumn' => 'log_category_id', - 'data' => array( - 'database', 'authentication', 'users', 'general', 'project', 'helpdesk', 'todo', - 'tags', 'estimates', 'navigation', 'preferences' - ), - ), - 'record_type_table' => array( - 'prefix' => 'rectype', - 'idColumn' => 'record_type_id', - 'data' => array( - 'project', 'todo', 'helpdesk' - ) - ) - ); - - foreach($requiredItems as $tableName => $info) { - //check that all the required values are present.} - foreach($info['data'] as $itemName) { - $configIndex = $info['prefix'] .'__'. $itemName; - - $getItemSql = "SELECT * FROM ". $tableName ." WHERE lower(name) = '". $itemName ."'"; - $numrows = $this->db->exec($getItemSql); - $dberror = $this->db->errorMsg(); - - if(!strlen($dberror)) { - if($numrows == 1) { - //retrieve the id & store it. - $data = $this->db->farray_fieldnames(); - $configData[$configIndex] = $data[$info['idColumn']]; - } - else { - throw new exception(__METHOD__ .": invalid data...? numrows=(". $numrows ."), dberror::: ". $dberror ."<BR>\nSQL::: ". $getItemSql); - } - } - else { - throw new exception(__METHOD__ .": failed to retrieve id for (". $itemName ."), rows=(". $numrows .") ERROR::: ". $dberror ."<BR>\nSQL::: ". $getItemSql); - } - } - } - - $this->gfObj->debug_print(__METHOD__ .": config data::: ". $this->gfObj->debug_print($configData,0)); - - //set this step's results. - store_setup_data(3, $configData, 'data'); - store_setup_data(3, 1, 'result'); - - return($configData); - }//end get_config_values() - //========================================================================= - - - - //========================================================================= - public function finish(cs_genericPage &$page) { - //retrieve some configuration values. - $this->get_config_values(); - - //create an upgrade{} object, for setting some internal values. - $obj = new _setupUpgrade($this->newDb); - $config = get_setup_data(3, 'data'); - $config['version_string'] = $obj->finalize_conversion(); - store_setup_data(3, $config, 'data'); - - store_setup_data(4, 1, 'accessible'); - $stepRes = get_setup_data(3, 'result'); - if($stepRes == 1) { - $page->set_message_wrapper(array( - 'title' => "Successfully Setup Data", - 'message' => "All default data was stored in the new database successfully!", - 'type' => "status" - )); - $page->conditional_header("/setup/4", TRUE); - } - else { - $page->set_message_wrapper(array( - 'title' => "Step Failed", - 'message' => "Please review the errors below and proceed accordingly.", - 'type' => "error" - )); - $page->conditional_header("/setup/3", TRUE); - } - - }//end finish() - //========================================================================= - -}//end __convertDatabase{} - - class _setupUpgrade extends upgrade { public function __construct(cs_phpDB $db) { Modified: trunk/1.2/includes/setup.inc =================================================================== --- trunk/1.2/includes/setup.inc 2008-02-14 07:05:11 UTC (rev 838) +++ trunk/1.2/includes/setup.inc 2008-02-14 07:58:02 UTC (rev 839) @@ -19,7 +19,8 @@ require_once(dirname(__FILE__) .'/../lib/simpletest/unit_tester.php'); require_once(dirname(__FILE__) .'/../lib/simpletest/reporter.php'); -$configData = read_config_file(FALSE); +$configObj = new config(NULL, FALSE); +$configData = $configObj->read_config_file(FALSE); if(strlen($configData['DATABASE__DBNAME'])) { //setup already complete. Stop 'em. Modified: trunk/1.2/lib/config.class.php =================================================================== --- trunk/1.2/lib/config.class.php 2008-02-14 07:05:11 UTC (rev 838) +++ trunk/1.2/lib/config.class.php 2008-02-14 07:58:02 UTC (rev 839) @@ -12,7 +12,7 @@ private $fileName; //------------------------------------------------------------------------- - public function __construct($fileName=NULL, $redirectOnFileMissing=TRUE) { + public function __construct($fileName=NULL) { $this->gf = new cs_globalFunctions(); $this->fs = new cs_fileSystemClass(dirname(__FILE__) .'/..'); @@ -24,10 +24,6 @@ //Redirect them to the setup page. if(!file_exists($this->fileName)) { $this->fileExists = FALSE; - if($redirectOnFileMissing) { - $this->gf->conditional_header("/setup?from=". urlencode($_SERVER['REQUEST_URI'])); - exit; - } } else { $this->fileExists = TRUE; @@ -58,7 +54,7 @@ } } else { - throw new exception(__METHOD__ .": config file doesn't exist"); + $config = NULL; } return($config); @@ -75,7 +71,7 @@ public function read_config_file($defineConstants=TRUE, $setEverything=TRUE) { $config = $this->get_config_contents(TRUE); - if($defineConstants) { + if(!is_null($config) && $defineConstants) { $conditionallySet = array('VERSION_STRING', 'WORKINGONIT'); foreach($config as $index=>$value) { if(in_array($index, $conditionallySet)) { @@ -104,17 +100,24 @@ //read the sample config. $config = new config(dirname(__FILE__) .'/config.xml', FALSE); - $myData = $config->get_config_contents(FALSE); + $myData = $config->get_config_contents(); + //parse the sample config for it's attributes, so we can display the page properly. + $sampleConfig = new config(dirname(__FILE__) .'/../docs/samples/sample_config.xml', FALSE); + $systemData = $sampleConfig->get_config_contents(FALSE); + $mainAttributes = $myData['attributes']; + unset($myData['type'], $myData['attributes']); $parsedRows = ""; $defaultRowName = 'setting_text'; - foreach($myData as $indexName=>$data) { - $attributes = $data['attributes']; - $value = $data['value']; - unset($data['type'], $data['attributes'], $data['value']); + foreach($systemData as $indexName=>$defaultValue) { + $value = NULL; + if(is_array($myData) && isset($myData[$indexName])) { + $value = $myData[$indexName]; + } + $attributes = $systemData[$indexName]['attributes']; $indexName = strtolower($indexName); //pull the appropriate template row. Modified: trunk/1.2/lib/site_config.php =================================================================== --- trunk/1.2/lib/site_config.php 2008-02-14 07:05:11 UTC (rev 838) +++ trunk/1.2/lib/site_config.php 2008-02-14 07:58:02 UTC (rev 839) @@ -22,6 +22,7 @@ require_once(dirname(__FILE__) .'/cs-phpxml/xmlCreatorClass.php'); require_once(dirname(__FILE__) .'/cs-phpxml/xmlParserClass.php'); require_once(dirname(__FILE__) .'/cs-content/cs_globalFunctions.php'); +require_once(dirname(__FILE__) .'/config.class.php'); define(CONFIG_FILENAME, 'config.xml'); //Set of functions that should be usefull to everyone @@ -62,43 +63,8 @@ //########################################################################## -//------------------------------------------------------------------- -function read_config_file($setEverything=TRUE) { - if(!file_exists(dirname(__FILE__) .'/'. CONFIG_FILENAME)) { - $gf = new cs_globalFunctions; - $gf->conditional_header("/setup?from=". urlencode($_SERVER['REQUEST_URI'])); - exit; - } - - $fs = new cs_fileSystemClass(dirname(__FILE__)); - - $xmlString = $fs->read(CONFIG_FILENAME); - - - //parse the file. - $xmlParser = new xmlParser($xmlString); - - $config = $xmlParser->get_tree(TRUE); - $config = $config['CONFIG']; - unset($config['type'], $config['attributes']); - - $conditionallySet = array('VERSION_STRING', 'WORKINGONIT'); - foreach($config as $index=>$value) { - if(in_array($index, $conditionallySet)) { - //only set this part if we're told to. - if($setEverything) { - define($index, $value); - } - } - else { - define($index, $value); - } - } - - return($config); - -}//end read_config_file() -//------------------------------------------------------------------- +$config = new config(dirname(__FILE__) .'/'. CONFIG_FILENAME, FALSE); +$config->read_config_file(TRUE, TRUE); check_external_lib_versions(); Modified: trunk/1.2/templates/setup/3.content.tmpl =================================================================== --- trunk/1.2/templates/setup/3.content.tmpl 2008-02-14 07:05:11 UTC (rev 838) +++ trunk/1.2/templates/setup/3.content.tmpl 2008-02-14 07:58:02 UTC (rev 839) @@ -2,20 +2,9 @@ {stepData} <form method="POST"> -<div id="setup_text" style="display:inline;"> -<h2>Please Select an Option:</h2> -<a href="javascript:void(setup__enableInput('setup', 'newInstall'));">Perform New Install</a> -or -<a href="javascript:void(setup__enableInput('setup', 'convertExisting'));">Convert Existing Database</a> -</div> -<input type="hidden" id="setup_selectedOption" name="selectedOption" value=""> - -<div id="setup_newInstall_div" style="display:none;"> - - <p> This step will build the following default values in the database: <ul> @@ -59,80 +48,9 @@ </tr> </table> -</div> -<div id="setup_convertExisting_div" style="display:none;"> -<p> - <blink><font color="red">!!!WARNING!!!<b></b></font></blink> This process may take <b>several minutes</b> to complete, - depending upon the speed of the two servers, this webserver, and how many records need to be transferred.<BR><BR> - - This step will attempt to do the following: - <ul> - <li>Determine existing database version</li> - <li>Convert existing information</li> - <li>Ensure the following items contain the necessary values (in new database): - <ul> - <li>Version information</li> - <li>Log categories, classes, and record type data</li> - <li>Attribute records</li> - <li>Anonymous contact data & groups</li> - <li>Status records</li> - <li>Tag names</li> - <li>Preferences & options</li> - <li>Administrator/user information</li> - </ul> - </li> - </ul> -</p> -<table border="1" cellpadding="3" cellspacing="0"> - <tr> - <th>Database Name (cs_project)</th> - - <td><input type="text" name="fields[database__dbname]" value="{database__dbname}"></td> - - <td>Name of the database within PostgreSQL (i.e. "cs_project")</td> - </tr> - <tr> +<input id="submitButton" type="submit" name="go" value="Create default values & proceed to the next step" onClick="new Effect.DropOut('submitButton');"> - <th>Hostname (localhost)</th> - - <td><input type="text" name="fields[database__host]" value="{database__host}"></td> - - <td>Fully qualified host name (like "taz.google.com" or "localhost").</td> - </tr> - <tr> - <th>Port (5432)</th> - - <td><input type="text" name="fields[database__port]" value="{database__port}"></td> - - - <td>Port to connect to PostgreSQL on (default is 5432).</td> - </tr> - <tr> - <th>Database Username (postgres)</th> - - <td><input type="text" name="fields[database__user]" value="{database__user}"></td> - - <td>Username for connecting to PostgreSQL (if you don't know, it's probably "postgres", though connecting as a SUPERUSER is generally accepted as a BAD THING).</td> - </tr> - - <tr> - <th>Database Password</th> - - <td><input type="text" name="fields[database__password]" value="{database__password}"></td> - - <td>Password for connecting to PostgreSQL (for a trusted connection, this can be blank).</td> - </tr> -</table> -</div> - -<div id="setup_newInstall_submitButton" style="display:none;"> - <input id="submitButton" type="submit" name="go" value="Create default values & proceed to the next step" onClick="new Effect.DropOut('submitButton');"> -</div> -<div id="setup_convertExisting_submitButton" style="display:none;"> - <input id="submitButton2" type="submit" name="go" value="Convert existing database & proceed to the next step" onClick="new Effect.DropOut('submitButton2');"> -</div> - </form> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-14 07:05:13
|
Revision: 838 http://cs-project.svn.sourceforge.net/cs-project/?rev=838&view=rev Author: crazedsanity Date: 2008-02-13 23:05:11 -0800 (Wed, 13 Feb 2008) Log Message: ----------- Move building of update settings interface into config{}. NOTE::: some updates may need to be done to keep from segfaulting (through the need of config{} to create possibly multiple instances of itself within itself. Also, config::__construct() may need to be a bit less strict in order to avoid those same problems. Modified Paths: -------------- trunk/1.2/includes/content/settings.inc trunk/1.2/lib/config.class.php Modified: trunk/1.2/includes/content/settings.inc =================================================================== --- trunk/1.2/includes/content/settings.inc 2008-02-11 03:11:01 UTC (rev 837) +++ trunk/1.2/includes/content/settings.inc 2008-02-14 07:05:11 UTC (rev 838) @@ -131,61 +131,11 @@ if(count($page->ftsSections) == 3 && $page->ftsSections[2] == 'admin') { if($user->is_admin() == 1) { - //read the sample config. - require_once(dirname(__FILE__) .'/../../lib/config.class.php'); - $config = new config(dirname(__FILE__) .'/../../lib/config.xml', FALSE); - $myData = $config->get_config_contents(FALSE); + #debug_print(get_class($page)); - $mainAttributes = $myData['attributes']; - unset($myData['type'], $myData['attributes']); + $config = new config(); + $config->build_update_interface($page); - $parsedRows = ""; - $defaultRowName = 'setting_text'; - foreach($myData as $indexName=>$data) { - $attributes = $data['attributes']; - $value = $data['value']; - unset($data['type'], $data['attributes'], $data['value']); - $indexName = strtolower($indexName); - - //pull the appropriate template row. - $rowName = $defaultRowName; - if(strlen($attributes['TYPE'])) { - $rowName = 'setting_'. $attributes['TYPE']; - - $optionList = NULL; - if($attributes['TYPE'] == 'select' && isset($attributes['OPTIONS'])) { - #debug_print(explode('|', $attributes['OPTIONS'])); - $tmpOptionList = explode('|', $attributes['OPTIONS']); - $optionList = array(); - foreach($tmpOptionList as $optionInfo) { - $x = explode('=', $optionInfo); - $optionList[$x[0]] = $x[1]; - } - $optionList = $page->gfObj->array_as_option_list($optionList, $attributes['DEFAULT']); - } - } - - if(!isset($page->templateRows[$rowName])) { - throw new exception(__METHOD__ .": failed to retrieve block row named (". $rowName .")"); - } - - //now parse stuff into the row... - $repArr = array( - 'disabled' => $attributes['disabled'], - 'index' => $indexName, - 'title' => $attributes['TITLE'], - 'description' => $attributes['DESCRIPTION'], - 'value' => $value - ); - if(!is_null($optionList)) { - $repArr['setting_select__normal'] = $optionList; - } - $parsedRows .= $page->mini_parser($page->templateRows[$rowName], $repArr); - } - #debug_print($parsedRows); - $page->add_template_var($defaultRowName, $parsedRows); - - //create an object with administrative capabilities. $adminUserClass = new adminUserClass($page->db); Modified: trunk/1.2/lib/config.class.php =================================================================== --- trunk/1.2/lib/config.class.php 2008-02-11 03:11:01 UTC (rev 837) +++ trunk/1.2/lib/config.class.php 2008-02-14 07:05:11 UTC (rev 838) @@ -93,5 +93,68 @@ return($config); }//end read_config_file() //------------------------------------------------------------------------- + + + + //------------------------------------------------------------------------- + /** + * Create a page (portion of a page, actually) to set/update config settings. + */ + public function build_update_interface(cs_genericPage &$page) { + + //read the sample config. + $config = new config(dirname(__FILE__) .'/config.xml', FALSE); + $myData = $config->get_config_contents(FALSE); + + $mainAttributes = $myData['attributes']; + unset($myData['type'], $myData['attributes']); + + $parsedRows = ""; + $defaultRowName = 'setting_text'; + foreach($myData as $indexName=>$data) { + $attributes = $data['attributes']; + $value = $data['value']; + unset($data['type'], $data['attributes'], $data['value']); + $indexName = strtolower($indexName); + + //pull the appropriate template row. + $rowName = $defaultRowName; + if(strlen($attributes['TYPE'])) { + $rowName = 'setting_'. $attributes['TYPE']; + + $optionList = NULL; + if($attributes['TYPE'] == 'select' && isset($attributes['OPTIONS'])) { + #debug_print(explode('|', $attributes['OPTIONS'])); + $tmpOptionList = explode('|', $attributes['OPTIONS']); + $optionList = array(); + foreach($tmpOptionList as $optionInfo) { + $x = explode('=', $optionInfo); + $optionList[$x[0]] = $x[1]; + } + $optionList = $page->gfObj->array_as_option_list($optionList, $attributes['DEFAULT']); + } + } + + if(!isset($page->templateRows[$rowName])) { + throw new exception(__METHOD__ .": failed to retrieve block row named (". $rowName .")"); + } + + //now parse stuff into the row... + $repArr = array( + 'disabled' => $attributes['disabled'], + 'index' => $indexName, + 'title' => $attributes['TITLE'], + 'description' => $attributes['DESCRIPTION'], + 'value' => $value + ); + if(!is_null($optionList)) { + $repArr['setting_select__normal'] = $optionList; + } + $parsedRows .= $page->mini_parser($page->templateRows[$rowName], $repArr); + } + #debug_print($parsedRows); + $page->add_template_var($defaultRowName, $parsedRows); + }//end build_update_interface() + //------------------------------------------------------------------------- }//end config{} ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 03:11:08
|
Revision: 837 http://cs-project.svn.sourceforge.net/cs-project/?rev=837&view=rev Author: crazedsanity Date: 2008-02-10 19:11:01 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Minor formatting so editing current estimate is more friendly. Modified Paths: -------------- trunk/1.2/templates/content/todo/view.content.tmpl Modified: trunk/1.2/templates/content/todo/view.content.tmpl =================================================================== --- trunk/1.2/templates/content/todo/view.content.tmpl 2008-02-11 02:41:48 UTC (rev 836) +++ trunk/1.2/templates/content/todo/view.content.tmpl 2008-02-11 03:11:01 UTC (rev 837) @@ -133,10 +133,10 @@ <td style="border-bottom:solid #000 1px;"> <table border=2> <tr> - <th colspan="2">Hours Logged So Far (Last {hoursLoggedLimit}):</th> + <th colspan="3">Hours Logged So Far (Last {hoursLoggedLimit}):</th> </tr> <tr> - <td colspan="2" align="center"> + <td colspan="3" align="center"> <table> <tr> <td><b>Timestamp</b></td> @@ -156,17 +156,18 @@ </td> </tr> <tr> - <td> + <td nowrap> <b>Original Estimate:</b> {estimate_original} <!-- BEGIN input_orig_estimate --> - <input type="text" size="15" maxlength="15" name="updates[estimate_original]" value=""> + <input type="text" size="5" maxlength="5" name="updates[estimate_original]" value=""> <!-- END input_orig_estimate --> - - <b>Current Estimate:</b> <div id="estimate_current_text" style="display:inline;">{estimate_current} + </td> + <td nowrap> + <b>Current Estimate:</b> <div nowrap id="estimate_current_text" style="display:inline;">{estimate_current} <!-- BEGIN modifiable_curr_estimate --> [<a href="javascript:void(enableInput('estimate_current'))">Edit</a>]</div> <div id="estimate_current_inputDiv" style="display:none;"> - <input id="estimate_current_input" type="text" size="15" maxlength="15" name="updates[estimate_current]" value="" disabled> + <input id="estimate_current_input" type="text" size="5" maxlength="5" name="updates[estimate_current]" value="" disabled> <!-- END modifiable_curr_estimate --> </div> </td> @@ -174,7 +175,7 @@ <td> <b>Time Elapsed:</b> {estimate_elapsed} <!-- BEGIN addElapsed --> - -- <b>Add more:</b><input type="text" size="15" maxlength="15" name="updates[add_elapsed]" value=""> + -- <b>Add more:</b><input type="text" size="5" maxlength="5" name="updates[add_elapsed]" value=""> <!-- END addElapsed --> </td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 02:41:58
|
Revision: 836 http://cs-project.svn.sourceforge.net/cs-project/?rev=836&view=rev Author: crazedsanity Date: 2008-02-10 18:41:48 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Minor superficial HTML change. Modified Paths: -------------- trunk/1.2/templates/help/footer.shared.tmpl Modified: trunk/1.2/templates/help/footer.shared.tmpl =================================================================== --- trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:36:08 UTC (rev 835) +++ trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:41:48 UTC (rev 836) @@ -3,9 +3,9 @@ <hr> <h3>Topics:</h3> -<h3><a href="/help/lost_password">Lost Password</a></h3> +<h4><a href="/help/lost_password">Lost Password</a></h4> -<a href="/help/helpdesk"><b>Helpdesk</b></a> +<h4><a href="/help/helpdesk">Helpdesk</a></h4> <ul> <li><a href="/help/helpdesk/assigned">Assigned User</a></li> <li><a href="/help/helpdesk/external_link">External Link</a></li> @@ -15,13 +15,14 @@ <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> </ul> -<a href="/help/tag"><b>Tags</b></a> + +<h4><a href="/help/tag">Tags</a></h4> <ul> <li><a href="/help/tag/modifier">Modifier</a></li> </ul> -<a href="/help/task"><b>Tasks</b></a> +<h4><a href="/help/task">Tasks</a></h4> <ul> <li><a href="/help/task/hours">Hours</a></li> </ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 02:36:16
|
Revision: 835 http://cs-project.svn.sourceforge.net/cs-project/?rev=835&view=rev Author: crazedsanity Date: 2008-02-10 18:36:08 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Consolidate list of links into the footer. Modified Paths: -------------- trunk/1.2/templates/help/footer.shared.tmpl Removed Paths: ------------- trunk/1.2/templates/help/links__helpdesk.shared.tmpl trunk/1.2/templates/help/links__tag.shared.tmpl trunk/1.2/templates/help/links__task.shared.tmpl Modified: trunk/1.2/templates/help/footer.shared.tmpl =================================================================== --- trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:31:59 UTC (rev 834) +++ trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:36:08 UTC (rev 835) @@ -4,9 +4,27 @@ <h3>Topics:</h3> <h3><a href="/help/lost_password">Lost Password</a></h3> -{links__helpdesk} -{links__tag} -{links__task} +<a href="/help/helpdesk"><b>Helpdesk</b></a> +<ul> + <li><a href="/help/helpdesk/assigned">Assigned User</a></li> + <li><a href="/help/helpdesk/external_link">External Link</a></li> + <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> + <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> + <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> + <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> +</ul> + +<a href="/help/tag"><b>Tags</b></a> +<ul> + <li><a href="/help/tag/modifier">Modifier</a></li> +</ul> + + +<a href="/help/task"><b>Tasks</b></a> +<ul> + <li><a href="/help/task/hours">Hours</a></li> +</ul> + </body> </html> \ No newline at end of file Deleted: trunk/1.2/templates/help/links__helpdesk.shared.tmpl =================================================================== --- trunk/1.2/templates/help/links__helpdesk.shared.tmpl 2008-02-11 02:31:59 UTC (rev 834) +++ trunk/1.2/templates/help/links__helpdesk.shared.tmpl 2008-02-11 02:36:08 UTC (rev 835) @@ -1,10 +0,0 @@ - -<a href="/help/helpdesk"><b>Helpdesk</b></a> -<ul> - <li><a href="/help/helpdesk/assigned">Assigned User</a></li> - <li><a href="/help/helpdesk/external_link">External Link</a></li> - <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> - <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> - <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> - <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> -</ul> \ No newline at end of file Deleted: trunk/1.2/templates/help/links__tag.shared.tmpl =================================================================== --- trunk/1.2/templates/help/links__tag.shared.tmpl 2008-02-11 02:31:59 UTC (rev 834) +++ trunk/1.2/templates/help/links__tag.shared.tmpl 2008-02-11 02:36:08 UTC (rev 835) @@ -1,5 +0,0 @@ - -<a href="/help/tag"><b>Tags</b></a> -<ul> - <li><a href="/help/tag/modifier">Modifier</a></li> -</ul> \ No newline at end of file Deleted: trunk/1.2/templates/help/links__task.shared.tmpl =================================================================== --- trunk/1.2/templates/help/links__task.shared.tmpl 2008-02-11 02:31:59 UTC (rev 834) +++ trunk/1.2/templates/help/links__task.shared.tmpl 2008-02-11 02:36:08 UTC (rev 835) @@ -1,5 +0,0 @@ - -<a href="/help/task"><b>Tasks</b></a> -<ul> - <li><a href="/help/task/hours">Hours</a></li> -</ul> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 02:32:02
|
Revision: 834 http://cs-project.svn.sourceforge.net/cs-project/?rev=834&view=rev Author: crazedsanity Date: 2008-02-10 18:31:59 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Updated list of topics for help. Modified Paths: -------------- trunk/1.2/templates/help/footer.shared.tmpl trunk/1.2/templates/help/index.content.tmpl Modified: trunk/1.2/templates/help/footer.shared.tmpl =================================================================== --- trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:28:26 UTC (rev 833) +++ trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:31:59 UTC (rev 834) @@ -3,6 +3,7 @@ <hr> <h3>Topics:</h3> +<h3><a href="/help/lost_password">Lost Password</a></h3> {links__helpdesk} {links__tag} {links__task} Modified: trunk/1.2/templates/help/index.content.tmpl =================================================================== --- trunk/1.2/templates/help/index.content.tmpl 2008-02-11 02:28:26 UTC (rev 833) +++ trunk/1.2/templates/help/index.content.tmpl 2008-02-11 02:31:59 UTC (rev 834) @@ -1,7 +1 @@ <h1>Welcome to the Help System!</h1> -<h2>Topics</h2> -<ul> - <li><a href="/help/lost_password">Lost Password</a></li> - <li><a href="/help/helpdesk">Helpdesk</a></li> - <li><a href="/help/tag">Tags</a></li> -</ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 02:29:08
|
Revision: 833 http://cs-project.svn.sourceforge.net/cs-project/?rev=833&view=rev Author: crazedsanity Date: 2008-02-10 18:28:26 -0800 (Sun, 10 Feb 2008) Log Message: ----------- More help topics. Modified Paths: -------------- trunk/1.2/templates/help/footer.shared.tmpl trunk/1.2/templates/help/links__helpdesk.shared.tmpl trunk/1.2/templates/help/links__tag.shared.tmpl Added Paths: ----------- trunk/1.2/templates/help/links__task.shared.tmpl trunk/1.2/templates/help/task/hours.content.tmpl Modified: trunk/1.2/templates/help/footer.shared.tmpl =================================================================== --- trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 01:33:13 UTC (rev 832) +++ trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 02:28:26 UTC (rev 833) @@ -1,6 +1,11 @@ +<hr> +<h3>Topics:</h3> + {links__helpdesk} +{links__tag} +{links__task} </body> </html> \ No newline at end of file Modified: trunk/1.2/templates/help/links__helpdesk.shared.tmpl =================================================================== --- trunk/1.2/templates/help/links__helpdesk.shared.tmpl 2008-02-11 01:33:13 UTC (rev 832) +++ trunk/1.2/templates/help/links__helpdesk.shared.tmpl 2008-02-11 02:28:26 UTC (rev 833) @@ -1,7 +1,4 @@ -<hr> -<h3>Topics:</h3> - <a href="/help/helpdesk"><b>Helpdesk</b></a> <ul> <li><a href="/help/helpdesk/assigned">Assigned User</a></li> Modified: trunk/1.2/templates/help/links__tag.shared.tmpl =================================================================== --- trunk/1.2/templates/help/links__tag.shared.tmpl 2008-02-11 01:33:13 UTC (rev 832) +++ trunk/1.2/templates/help/links__tag.shared.tmpl 2008-02-11 02:28:26 UTC (rev 833) @@ -1,13 +1,5 @@ -<hr> -<h3>Topics:</h3> - -<a href="/help/helpdesk"><b>Helpdesk</b></a> +<a href="/help/tag"><b>Tags</b></a> <ul> - <li><a href="/help/helpdesk/assigned">Assigned User</a></li> - <li><a href="/help/helpdesk/external_link">External Link</a></li> - <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> - <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> - <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> - <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> + <li><a href="/help/tag/modifier">Modifier</a></li> </ul> \ No newline at end of file Copied: trunk/1.2/templates/help/links__task.shared.tmpl (from rev 832, trunk/1.2/templates/help/links__tag.shared.tmpl) =================================================================== --- trunk/1.2/templates/help/links__task.shared.tmpl (rev 0) +++ trunk/1.2/templates/help/links__task.shared.tmpl 2008-02-11 02:28:26 UTC (rev 833) @@ -0,0 +1,5 @@ + +<a href="/help/task"><b>Tasks</b></a> +<ul> + <li><a href="/help/task/hours">Hours</a></li> +</ul> \ No newline at end of file Added: trunk/1.2/templates/help/task/hours.content.tmpl =================================================================== --- trunk/1.2/templates/help/task/hours.content.tmpl (rev 0) +++ trunk/1.2/templates/help/task/hours.content.tmpl 2008-02-11 02:28:26 UTC (rev 833) @@ -0,0 +1,14 @@ +<h2>Hours</h2> + +Hours for a task are divided into 3 different categories: + +<ul> + <li><b>Original Estimate:</b> Set at the time of task creation, this + indicates how long it was originally intended/estimated to take.</li> + <li><b>Current Estimate:</b> When the task is in progress, this + indicates how long it has taken thus far; after it is closed, this + indicates how long it took (compare against <i>original estimate</i>).</li> + <li><b>Time Elapsed:</b> Indicates how much time has been spent on the + task. Adding more time to a task will automatically increase this number + (along with <i>current estimate</i>, should that be exceeded).</li> +</ul> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:33:16
|
Revision: 832 http://cs-project.svn.sourceforge.net/cs-project/?rev=832&view=rev Author: crazedsanity Date: 2008-02-10 17:33:13 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Rename "tags" to "tag". Modified Paths: -------------- trunk/1.2/templates/content/helpdesk/view.content.tmpl trunk/1.2/templates/content/tags/index.content.tmpl Modified: trunk/1.2/templates/content/helpdesk/view.content.tmpl =================================================================== --- trunk/1.2/templates/content/helpdesk/view.content.tmpl 2008-02-11 01:31:43 UTC (rev 831) +++ trunk/1.2/templates/content/helpdesk/view.content.tmpl 2008-02-11 01:33:13 UTC (rev 832) @@ -148,7 +148,7 @@ </tr> <tr> <th align="right">Tags: - <a href="/help/tags" target="_blank"> + <a href="/help/tag" target="_blank"> <img src="/images/icon-help.png" border="0"></a> </th> Modified: trunk/1.2/templates/content/tags/index.content.tmpl =================================================================== --- trunk/1.2/templates/content/tags/index.content.tmpl 2008-02-11 01:31:43 UTC (rev 831) +++ trunk/1.2/templates/content/tags/index.content.tmpl 2008-02-11 01:33:13 UTC (rev 832) @@ -60,7 +60,7 @@ </tr> <tr> <td><b>Modifier:</b> - <a href="/help/tags/modifier" target="_blank"><img src="/images/icon-help.png" border="0"></a></td> + <a href="/help/tag/modifier" target="_blank"><img src="/images/icon-help.png" border="0"></a></td> <td> <select name="modifier" onChange="this.form.submit();"> {modifier_option_list} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:31:51
|
Revision: 831 http://cs-project.svn.sourceforge.net/cs-project/?rev=831&view=rev Author: crazedsanity Date: 2008-02-10 17:31:43 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Rename "tags" to "tag". Modified Paths: -------------- trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl trunk/1.2/templates/help/index.content.tmpl trunk/1.2/templates/help/tag/index.content.tmpl Added Paths: ----------- trunk/1.2/templates/help/links__tag.shared.tmpl trunk/1.2/templates/help/tag/ Removed Paths: ------------- trunk/1.2/templates/help/tags/ Modified: trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl 2008-02-11 01:26:43 UTC (rev 830) +++ trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl 2008-02-11 01:31:43 UTC (rev 831) @@ -11,7 +11,7 @@ 9 - New, not important, or superficial </pre> -The priority of an issue is initially based upon the <a href="/help/tags/modifier">modifiers of tags</a> that +The priority of an issue is initially based upon the <a href="/help/tag/modifier">modifiers of tags</a> that have been assigned to it. After creation, registered users can modify this to be whatever they desire. Modified: trunk/1.2/templates/help/index.content.tmpl =================================================================== --- trunk/1.2/templates/help/index.content.tmpl 2008-02-11 01:26:43 UTC (rev 830) +++ trunk/1.2/templates/help/index.content.tmpl 2008-02-11 01:31:43 UTC (rev 831) @@ -3,5 +3,5 @@ <ul> <li><a href="/help/lost_password">Lost Password</a></li> <li><a href="/help/helpdesk">Helpdesk</a></li> - <li><a href="/help/tags">Tags</a></li> + <li><a href="/help/tag">Tags</a></li> </ul> Copied: trunk/1.2/templates/help/links__tag.shared.tmpl (from rev 830, trunk/1.2/templates/help/links__helpdesk.shared.tmpl) =================================================================== --- trunk/1.2/templates/help/links__tag.shared.tmpl (rev 0) +++ trunk/1.2/templates/help/links__tag.shared.tmpl 2008-02-11 01:31:43 UTC (rev 831) @@ -0,0 +1,13 @@ + +<hr> +<h3>Topics:</h3> + +<a href="/help/helpdesk"><b>Helpdesk</b></a> +<ul> + <li><a href="/help/helpdesk/assigned">Assigned User</a></li> + <li><a href="/help/helpdesk/external_link">External Link</a></li> + <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> + <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> + <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> + <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> +</ul> \ No newline at end of file Copied: trunk/1.2/templates/help/tag (from rev 825, trunk/1.2/templates/help/tags) Modified: trunk/1.2/templates/help/tag/index.content.tmpl =================================================================== --- trunk/1.2/templates/help/tags/index.content.tmpl 2008-02-11 00:39:37 UTC (rev 825) +++ trunk/1.2/templates/help/tag/index.content.tmpl 2008-02-11 01:31:43 UTC (rev 831) @@ -3,4 +3,4 @@ <h2>What is a Tag?</h2> A tag is essentially something to help give more information at-a-glance about a given record. At creation time, a Helpdesk Issue can be linked to several different -tags with different <a href="/help/tags/modifier">modifiers</a>, which helps to determine <a href="/help/helpdesk/priority">priority</a>. \ No newline at end of file +tags with different <a href="/help/tag/modifier">modifiers</a>, which helps to determine <a href="/help/helpdesk/priority">priority</a>. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:27:02
|
Revision: 830 http://cs-project.svn.sourceforge.net/cs-project/?rev=830&view=rev Author: crazedsanity Date: 2008-02-10 17:26:43 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Rename template/file for my own sanity. :) Modified Paths: -------------- trunk/1.2/templates/help/footer.shared.tmpl Added Paths: ----------- trunk/1.2/templates/help/links__helpdesk.shared.tmpl Removed Paths: ------------- trunk/1.2/templates/help/helpdesk_links.shared.tmpl Modified: trunk/1.2/templates/help/footer.shared.tmpl =================================================================== --- trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 01:24:16 UTC (rev 829) +++ trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 01:26:43 UTC (rev 830) @@ -1,6 +1,6 @@ -{helpdesk_links} +{links__helpdesk} </body> </html> \ No newline at end of file Deleted: trunk/1.2/templates/help/helpdesk_links.shared.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk_links.shared.tmpl 2008-02-11 01:24:16 UTC (rev 829) +++ trunk/1.2/templates/help/helpdesk_links.shared.tmpl 2008-02-11 01:26:43 UTC (rev 830) @@ -1,13 +0,0 @@ - -<hr> -<h3>Topics:</h3> - -<a href="/help/helpdesk"><b>Helpdesk</b></a> -<ul> - <li><a href="/help/helpdesk/assigned">Assigned User</a></li> - <li><a href="/help/helpdesk/external_link">External Link</a></li> - <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> - <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> - <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> - <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> -</ul> \ No newline at end of file Copied: trunk/1.2/templates/help/links__helpdesk.shared.tmpl (from rev 827, trunk/1.2/templates/help/helpdesk_links.shared.tmpl) =================================================================== --- trunk/1.2/templates/help/links__helpdesk.shared.tmpl (rev 0) +++ trunk/1.2/templates/help/links__helpdesk.shared.tmpl 2008-02-11 01:26:43 UTC (rev 830) @@ -0,0 +1,13 @@ + +<hr> +<h3>Topics:</h3> + +<a href="/help/helpdesk"><b>Helpdesk</b></a> +<ul> + <li><a href="/help/helpdesk/assigned">Assigned User</a></li> + <li><a href="/help/helpdesk/external_link">External Link</a></li> + <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> + <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> + <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> + <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> +</ul> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:24:18
|
Revision: 829 http://cs-project.svn.sourceforge.net/cs-project/?rev=829&view=rev Author: crazedsanity Date: 2008-02-10 17:24:16 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Change where the help link is, etc. Modified Paths: -------------- trunk/1.2/templates/content/related_todo.shared.tmpl Modified: trunk/1.2/templates/content/related_todo.shared.tmpl =================================================================== --- trunk/1.2/templates/content/related_todo.shared.tmpl 2008-02-11 01:20:05 UTC (rev 828) +++ trunk/1.2/templates/content/related_todo.shared.tmpl 2008-02-11 01:24:16 UTC (rev 829) @@ -1,6 +1,10 @@ <table cellpadding="2" cellspacing="0" border="1"> <tr> - <td colspan="8"><b>Todo: </b>(<a href='/content/todo/create?parentPublicId={public_id}&module={module}' target=_top>Create</a>): + <td colspan="8"> + <b>Related Tasks: </b> + (<a href='/content/todo/create?parentPublicId={public_id}&module={module}' target=_top>Create</a>): + <a href="/help/task" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> <!-- BEGIN todoPrefWarning --> <BR><font color="red"><b>Warning:</b></font> Not all issues will be displayed, due to your <a href="/content/settings">preferences</a>. <!-- END todoPrefWarning --> @@ -14,10 +18,7 @@ <th>Status</th> <th>Title</th> <th>Deadline</th> - <th> - Hours Left <a href="/help/todo/hours_left" target="_blank"> - <img src="/images/icon-help.png" border="0"></a> - </th> + <th>Hours Left</th> </tr> <!-- BEGIN related_todo_row --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:20:22
|
Revision: 828 http://cs-project.svn.sourceforge.net/cs-project/?rev=828&view=rev Author: crazedsanity Date: 2008-02-10 17:20:05 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Help link instead of cumbersome note. Modified Paths: -------------- trunk/1.2/templates/content/related_todo.shared.tmpl Modified: trunk/1.2/templates/content/related_todo.shared.tmpl =================================================================== --- trunk/1.2/templates/content/related_todo.shared.tmpl 2008-02-11 01:17:29 UTC (rev 827) +++ trunk/1.2/templates/content/related_todo.shared.tmpl 2008-02-11 01:20:05 UTC (rev 828) @@ -4,8 +4,7 @@ <!-- BEGIN todoPrefWarning --> <BR><font color="red"><b>Warning:</b></font> Not all issues will be displayed, due to your <a href="/content/settings">preferences</a>. <!-- END todoPrefWarning --> - <hr> - <b>NOTE: </b>In the "Hours Left" column of todos, the format is::: <i>remaining hours (current estimate)</i></td> + </td> </tr> <tr> <th>Pri</th> @@ -15,7 +14,10 @@ <th>Status</th> <th>Title</th> <th>Deadline</th> - <th>Hours Left</th> + <th> + Hours Left <a href="/help/todo/hours_left" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> + </th> </tr> <!-- BEGIN related_todo_row --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:17:38
|
Revision: 827 http://cs-project.svn.sourceforge.net/cs-project/?rev=827&view=rev Author: crazedsanity Date: 2008-02-10 17:17:29 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Move the "Topics" to the footer so it's viewable everywhere. Modified Paths: -------------- trunk/1.2/templates/help/footer.shared.tmpl trunk/1.2/templates/help/helpdesk/assigned.content.tmpl trunk/1.2/templates/help/helpdesk/external_link.content.tmpl trunk/1.2/templates/help/helpdesk/index.content.tmpl trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl trunk/1.2/templates/help/helpdesk/notified_users.content.tmpl trunk/1.2/templates/help/helpdesk/project_linkage.content.tmpl trunk/1.2/templates/help/helpdesk/submit_buttons.content.tmpl trunk/1.2/templates/help/task/index.content.tmpl Added Paths: ----------- trunk/1.2/templates/help/helpdesk_links.shared.tmpl Removed Paths: ------------- trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl Modified: trunk/1.2/templates/help/footer.shared.tmpl =================================================================== --- trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/footer.shared.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -1,3 +1,6 @@ + +{helpdesk_links} + </body> </html> \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/assigned.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/assigned.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/assigned.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -1,5 +1,3 @@ <h2>Assigned User</h2> This is the user that has been assigned the given issue. Besides administrators, they are the only user that is allowed to solve the issue. - -{helpdesk_links} \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/external_link.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/external_link.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/external_link.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -2,5 +2,3 @@ When viewing a Helpdesk Issue, there is an "External Link" provided for developers, so they may send a link to users who are not registered. This URL allows non-registered users to view the link without worrying about having to login.<BR><BR> - -{helpdesk_links} \ No newline at end of file Deleted: trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -1,13 +0,0 @@ - -<hr> -<h3>Topics:</h3> - -<a href="/help/helpdesk"><b>Helpdesk</b></a> -<ul> - <li><a href="/help/helpdesk/assigned">Assigned User</a></li> - <li><a href="/help/helpdesk/external_link">External Link</a></li> - <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> - <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> - <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> - <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> -</ul> \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/index.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/index.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/index.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -5,5 +5,3 @@ Issues are created to notify developers of bugs or request new features. Developers and users are notified whenever there is a change, or when the issue has been completed, so everybody concerned is kept up-to-date. - -{helpdesk_links} \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -15,5 +15,3 @@ have been assigned to it. After creation, registered users can modify this to be whatever they desire. - -{helpdesk_links} \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/notified_users.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/notified_users.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/notified_users.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -5,5 +5,3 @@ this list. At present, there is no option to be removed from the notified users list. If you feel this is an important feature, please <a href="/extern/helpdesk/create">file an issue</a> about it.</p> - -{helpdesk_links} \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/project_linkage.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/project_linkage.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/project_linkage.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -23,5 +23,3 @@ version of the software. This makes a very important difference to the developers, as it indicates where the problem has occurred. - -{helpdesk_links} \ No newline at end of file Modified: trunk/1.2/templates/help/helpdesk/submit_buttons.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/submit_buttons.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/helpdesk/submit_buttons.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -8,5 +8,3 @@ <li>Solve: completes the issue after entering the solution (requires info in the "Solution" box).</li> <li>Re-Open: opens the issue for modification and logs the action.</li> </ul> - -{helpdesk_links} \ No newline at end of file Copied: trunk/1.2/templates/help/helpdesk_links.shared.tmpl (from rev 825, trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl) =================================================================== --- trunk/1.2/templates/help/helpdesk_links.shared.tmpl (rev 0) +++ trunk/1.2/templates/help/helpdesk_links.shared.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -0,0 +1,13 @@ + +<hr> +<h3>Topics:</h3> + +<a href="/help/helpdesk"><b>Helpdesk</b></a> +<ul> + <li><a href="/help/helpdesk/assigned">Assigned User</a></li> + <li><a href="/help/helpdesk/external_link">External Link</a></li> + <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> + <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> + <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> + <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> +</ul> \ No newline at end of file Modified: trunk/1.2/templates/help/task/index.content.tmpl =================================================================== --- trunk/1.2/templates/help/task/index.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) +++ trunk/1.2/templates/help/task/index.content.tmpl 2008-02-11 01:17:29 UTC (rev 827) @@ -4,5 +4,3 @@ pieces. Each task can be be assigned to a user, and the estimated hours can be tracked per task. Notes can be added to ensure proper documentation (along with any thoughts that anybody has along the way). - -{task_links} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 01:15:46
|
Revision: 826 http://cs-project.svn.sourceforge.net/cs-project/?rev=826&view=rev Author: crazedsanity Date: 2008-02-10 17:15:44 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Task (a.k.a. "todo") help section. Added Paths: ----------- trunk/1.2/templates/help/task/ trunk/1.2/templates/help/task/index.content.tmpl Added: trunk/1.2/templates/help/task/index.content.tmpl =================================================================== --- trunk/1.2/templates/help/task/index.content.tmpl (rev 0) +++ trunk/1.2/templates/help/task/index.content.tmpl 2008-02-11 01:15:44 UTC (rev 826) @@ -0,0 +1,8 @@ +<h2>Tasks</h2> + +Tasks are used to break-up a single project or helpdesk issue into smaller +pieces. Each task can be be assigned to a user, and the estimated hours can be +tracked per task. Notes can be added to ensure proper documentation (along +with any thoughts that anybody has along the way). + +{task_links} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 00:39:41
|
Revision: 825 http://cs-project.svn.sourceforge.net/cs-project/?rev=825&view=rev Author: crazedsanity Date: 2008-02-10 16:39:37 -0800 (Sun, 10 Feb 2008) Log Message: ----------- No longer convert newlines into <BR> tags for the help section. Modified Paths: -------------- trunk/1.2/includes/help.inc Modified: trunk/1.2/includes/help.inc =================================================================== --- trunk/1.2/includes/help.inc 2008-02-11 00:38:21 UTC (rev 824) +++ trunk/1.2/includes/help.inc 2008-02-11 00:39:37 UTC (rev 825) @@ -34,6 +34,4 @@ ); create_page_title($page, $titleParts); -$page->templateVars['content'] = nl2br($page->templateVars['content']); - ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-11 00:38:25
|
Revision: 824 http://cs-project.svn.sourceforge.net/cs-project/?rev=824&view=rev Author: crazedsanity Date: 2008-02-10 16:38:21 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Superficial changes to help section. Modified Paths: -------------- trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl trunk/1.2/templates/help/lost_password.content.tmpl trunk/1.2/templates/help/main.shared.tmpl Added Paths: ----------- trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl Removed Paths: ------------- trunk/1.2/templates/help/helpdesk/priority.content.tmpl Modified: trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl 2008-02-09 22:05:01 UTC (rev 823) +++ trunk/1.2/templates/help/helpdesk/helpdesk_links.shared.tmpl 2008-02-11 00:38:21 UTC (rev 824) @@ -6,8 +6,8 @@ <ul> <li><a href="/help/helpdesk/assigned">Assigned User</a></li> <li><a href="/help/helpdesk/external_link">External Link</a></li> + <li><a href="/help/helpdesk/issue_priority">Issue Priority</a></li> <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> - <li><a href="/help/helpdesk/priority">Priority</a></li> <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> </ul> \ No newline at end of file Copied: trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl (from rev 823, trunk/1.2/templates/help/helpdesk/priority.content.tmpl) =================================================================== --- trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl (rev 0) +++ trunk/1.2/templates/help/helpdesk/issue_priority.content.tmpl 2008-02-11 00:38:21 UTC (rev 824) @@ -0,0 +1,19 @@ +<h2>Issue Priority</h2> + +Issue priority indicates how important the issue is in and of itself, or as it +pertains to a particular project. The meanings of priorities are roughly as +follows: + +<pre> + 0 - Critical (causes crash, fatal error, or data corruption) + 1 - Very Important (no crash, but causes fatal error or data corruption) + 2-8 - Varying degrees of importance + 9 - New, not important, or superficial +</pre> + +The priority of an issue is initially based upon the <a href="/help/tags/modifier">modifiers of tags</a> that +have been assigned to it. After creation, registered users can modify this to +be whatever they desire. + + +{helpdesk_links} \ No newline at end of file Deleted: trunk/1.2/templates/help/helpdesk/priority.content.tmpl =================================================================== --- trunk/1.2/templates/help/helpdesk/priority.content.tmpl 2008-02-09 22:05:01 UTC (rev 823) +++ trunk/1.2/templates/help/helpdesk/priority.content.tmpl 2008-02-11 00:38:21 UTC (rev 824) @@ -1,19 +0,0 @@ -<h2>Issue Priority</h2> - -Issue priority indicates how important the issue is in and of itself, or as it -pertains to a particular project. The meanings of priorities are roughly as -follows: - -<pre> - 0 - Critical (causes crash, fatal error, or data corruption) - 1 - Very Important (no crash, but causes fatal error or data corruption) - 2-8 - Varying degrees of importance - 9 - New, not important, or superficial -</pre> - -The priority of an issue is initially based upon the <a href="/help/tags/modifier">modifiers of tags</a> that -have been assigned to it. After creation, registered users can modify this to -be whatever they desire. - - -{helpdesk_links} \ No newline at end of file Modified: trunk/1.2/templates/help/lost_password.content.tmpl =================================================================== --- trunk/1.2/templates/help/lost_password.content.tmpl 2008-02-09 22:05:01 UTC (rev 823) +++ trunk/1.2/templates/help/lost_password.content.tmpl 2008-02-11 00:38:21 UTC (rev 824) @@ -1,6 +1,6 @@ -<div style="padding-top:20px;"> +<div style="padding-top:20px;padding-bottom:20px;"> <!-- BEGIN newSubmission --> <form method="POST" onSubmit="cs_submitButton_processing('submitRequest')" action="{PHP_SELF}?submitRequest"> <table border="0" cellpadding="3" cellspacing="0" style="border:solid #000 1px;"> Modified: trunk/1.2/templates/help/main.shared.tmpl =================================================================== --- trunk/1.2/templates/help/main.shared.tmpl 2008-02-09 22:05:01 UTC (rev 823) +++ trunk/1.2/templates/help/main.shared.tmpl 2008-02-11 00:38:21 UTC (rev 824) @@ -1,8 +1,6 @@ {header} <div id="outerContent" style="padding-left: 20px; padding-right:50px;;"> - <div id="content" style="border:dotted #000 1px;"> {content} - </div> </div> {footer} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 22:05:08
|
Revision: 823 http://cs-project.svn.sourceforge.net/cs-project/?rev=823&view=rev Author: crazedsanity Date: 2008-02-09 14:05:01 -0800 (Sat, 09 Feb 2008) Log Message: ----------- *** RELEASE 1.2.0-ALPHA3 *** SUMMARY OF CHANGES::: * lots of ajax additions (add/remove tags, update prefs, etc) * child project display fix (they don't wrap around the title anymore) * protect setup (redirects if the site has already been setup) * minor superficial changes (border on bottom of helpdesk access block) * related todo & notes now appear regardless of length of related issues * fix note creation, remove some unneeded code * add todo's to helpdesk issues (still needs some work) * "brought to you by" now displayed on main login (with hitstracker image) * fix users being attached multiple times to same group (issue #143) * NOTE: updating leader of group no longer works... * admin settings now at /content/settings/admin * config now contains attributes to determine display of update page (issue #115) * rewrite some invalid config entries into valid ones * update to cs-content v0.10.9, cs-phpxml v0.5.6 Modified Paths: -------------- trunk/1.2/VERSION Modified: trunk/1.2/VERSION =================================================================== --- trunk/1.2/VERSION 2008-02-09 21:40:48 UTC (rev 822) +++ trunk/1.2/VERSION 2008-02-09 22:05:01 UTC (rev 823) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.2.0-ALPHA2 +VERSION: 1.2.0-ALPHA3 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 21:40:50
|
Revision: 822 http://cs-project.svn.sourceforge.net/cs-project/?rev=822&view=rev Author: crazedsanity Date: 2008-02-09 13:40:48 -0800 (Sat, 09 Feb 2008) Log Message: ----------- Update to handle cs-content v0.10.9 and cs-phpxml v0.5.6 Modified Paths: -------------- trunk/1.2/lib/globalFunctions.php Modified: trunk/1.2/lib/globalFunctions.php =================================================================== --- trunk/1.2/lib/globalFunctions.php 2008-02-09 21:30:41 UTC (rev 821) +++ trunk/1.2/lib/globalFunctions.php 2008-02-09 21:40:48 UTC (rev 822) @@ -17,8 +17,8 @@ function get_required_external_lib_versions($projectName=NULL) { //format: {className} => array({projectName} => {exactVersion}) $requirements = array( - 'contentSystem' => array('cs-content', '0.10.8'), - 'XMLParser' => array('cs-phpxml', '0.5.5'), + 'contentSystem' => array('cs-content', '0.10.9'), + 'XMLParser' => array('cs-phpxml', '0.5.6'), 'arrayToPath' => array('cs-arrayToPath', '0.2.2') ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 21:30:44
|
Revision: 821 http://cs-project.svn.sourceforge.net/cs-project/?rev=821&view=rev Author: crazedsanity Date: 2008-02-09 13:30:41 -0800 (Sat, 09 Feb 2008) Log Message: ----------- Read existing config.xml instead of the sample. Modified Paths: -------------- trunk/1.2/includes/content/settings.inc Modified: trunk/1.2/includes/content/settings.inc =================================================================== --- trunk/1.2/includes/content/settings.inc 2008-02-09 21:30:08 UTC (rev 820) +++ trunk/1.2/includes/content/settings.inc 2008-02-09 21:30:41 UTC (rev 821) @@ -133,7 +133,7 @@ //read the sample config. require_once(dirname(__FILE__) .'/../../lib/config.class.php'); - $config = new config(dirname(__FILE__) .'/../../docs/samples/sample_config.xml', FALSE); + $config = new config(dirname(__FILE__) .'/../../lib/config.xml', FALSE); $myData = $config->get_config_contents(FALSE); $mainAttributes = $myData['attributes']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 21:30:12
|
Revision: 820 http://cs-project.svn.sourceforge.net/cs-project/?rev=820&view=rev Author: crazedsanity Date: 2008-02-09 13:30:08 -0800 (Sat, 09 Feb 2008) Log Message: ----------- Upgrade for 1.2.0-ALPHA3 (config has attributes for displaying admin update). /lib/upgradeClass.php: * update_config_file(): -- retain attributes instead of removing them. /upgrade/upgrade.xml: * update explanation to be slightly less confusing. /upgrade/upgradeTo1.2.0-ALPHA3.php: * run_upgrade(): -- no more transactions. * update_config_file(): -- backup the original config (just in case) -- updates existing config with attributes from sample config -- if the "CONFIG_EMAIL_SERVER_IP" tag exists in the current config and "PHPMAILER_HOST" isn't, use the value of the former for the latter (and remove the former). -- writes-out the updated config file. Modified Paths: -------------- trunk/1.2/lib/upgradeClass.php trunk/1.2/upgrade/upgrade.xml trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php Modified: trunk/1.2/lib/upgradeClass.php =================================================================== --- trunk/1.2/lib/upgradeClass.php 2008-02-09 10:01:10 UTC (rev 819) +++ trunk/1.2/lib/upgradeClass.php 2008-02-09 21:30:08 UTC (rev 820) @@ -631,7 +631,7 @@ $xmlCreator->load_xmlparser_data($xmlParser); //update the given index. - $xmlCreator->add_tag($index, $value); + $xmlCreator->add_tag($index, $value, $xmlParser->get_attribute('/CONFIG/'. strtoupper($index))); $this->mainConfig[strtoupper($index)] = $value; $xmlString = $xmlCreator->create_xml_string(); Modified: trunk/1.2/upgrade/upgrade.xml =================================================================== --- trunk/1.2/upgrade/upgrade.xml 2008-02-09 10:01:10 UTC (rev 819) +++ trunk/1.2/upgrade/upgrade.xml 2008-02-09 21:30:08 UTC (rev 820) @@ -1,8 +1,5 @@ <upgrade> - <system_note>The database and version listed in the config.xml file should - ALWAYS match. - - To determine which section in matching to use, heed only the information + <system_note>To determine which section in matching to use, heed only the information beneath the tag that indicates the current database version (for 5.2.4, you would find information under matching for "v5.2.4"). This section indicates the version that it should upgrade the database to Modified: trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php =================================================================== --- trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php 2008-02-09 10:01:10 UTC (rev 819) +++ trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php 2008-02-09 21:30:08 UTC (rev 820) @@ -27,13 +27,9 @@ //========================================================================= public function run_upgrade() { - $this->db->beginTrans(__METHOD__); - $this->update_config_file(); - exit; - $this->db->commitTrans(__METHOD__); - + return('Upgrade complete'); }//end run_upgrade() //========================================================================= @@ -48,25 +44,41 @@ $updateXml = new xmlCreator(); $updateXml->load_xmlparser_data($siteXmlObj); + + //BACKUP ORIGINAL XML CONFIG... + $backupFile = 'lib/__BACKUP__'. time() .'__config.xml'; + $fs->create_file($backupFile); + $fs->openFile($backupFile); + $fs->write($updateXml->create_xml_string()); + $sampleIndexes = $sampleXmlObj->get_tree(TRUE); $sampleIndexes = $sampleIndexes['CONFIG']; + $siteConfigIndexes = $siteXmlObj->get_tree(TRUE); + $siteConfigIndexes = $siteConfigIndexes['CONFIG']; foreach($sampleIndexes as $indexName=>$indexValue) { $path = '/CONFIG/'. $indexName; $attributes = $sampleXmlObj->get_attribute($path); #debug_print(__METHOD__ .": attributes from sample (/CONFIG/". $indexName ."::: ",1); #debug_print($attributes,1); + debug_print(__METHOD__ .': indexName=('. $indexName .'), indexValue=('. $indexValue .'), original config value=('. $siteConfigIndexes[$indexName] .')'); - if(is_array($attributes)) { - $updateXml->add_attribute($path, $attributes); + //add tag if it's not there, update values otherwise. + $tagValue = $attributes['DEFAULT']; + if(isset($siteConfigIndexes[$indexName])) { + $tagValue = $siteConfigIndexes[$indexName]; } + elseif($indexName == 'PHPMAILER_HOST' && isset($siteConfigIndexes['CONFIG_EMAIL_SERVER_IP'])) { + $tagValue = $siteConfigIndexes['CONFIG_EMAIL_SERVER_IP']; + $updateXml->remove_path('/CONFIG/CONFIG_EMAIL_SERVER_IP'); + } + $updateXml->add_tag($path, $tagValue, $attributes); } - $this->gfObj->debug_print($updateXml->create_xml_string()); - $fs->openFile('lib/_test_config.xml'); + $this->gfObj->debug_print($this->gfObj->cleanString($updateXml->create_xml_string(), 'htmlentity_plus_brackets')); + $fs->openFile('lib/config.xml'); $fs->write($updateXml->create_xml_string()); - exit; }//end update_config_file() //========================================================================= } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 10:01:15
|
Revision: 819 http://cs-project.svn.sourceforge.net/cs-project/?rev=819&view=rev Author: crazedsanity Date: 2008-02-09 02:01:10 -0800 (Sat, 09 Feb 2008) Log Message: ----------- Superficial changes for __autoload() and information in an exception from logsClass. Modified Paths: -------------- trunk/1.2/lib/logsClass.php trunk/1.2/lib/site_config.php Modified: trunk/1.2/lib/logsClass.php =================================================================== --- trunk/1.2/lib/logsClass.php 2008-02-09 05:34:13 UTC (rev 818) +++ trunk/1.2/lib/logsClass.php 2008-02-09 10:01:10 UTC (rev 819) @@ -501,7 +501,7 @@ } } else { - throw new exception(__METHOD__ .": failed to create new log_category"); + throw new exception(__METHOD__ .": failed to create new log_category (". $catName .")"); } return($retval); Modified: trunk/1.2/lib/site_config.php =================================================================== --- trunk/1.2/lib/site_config.php 2008-02-09 05:34:13 UTC (rev 818) +++ trunk/1.2/lib/site_config.php 2008-02-09 10:01:10 UTC (rev 819) @@ -185,13 +185,12 @@ } } - if($retval == TRUE) { - return($retval); - } - else { + if($retval !== TRUE) { throw new exception(__FUNCTION__ .": unable to find class file for (". $className .")"); } + return($retval); + }//end __autoload() //========================================================================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 05:34:17
|
Revision: 818 http://cs-project.svn.sourceforge.net/cs-project/?rev=818&view=rev Author: crazedsanity Date: 2008-02-08 21:34:13 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Beginning of re-writing XML config, but HTML encoding is a bitch (issue #150) Modified Paths: -------------- trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php Modified: trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php =================================================================== --- trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php 2008-02-09 05:33:30 UTC (rev 817) +++ trunk/1.2/upgrade/upgradeTo1.2.0-ALPHA3.php 2008-02-09 05:34:13 UTC (rev 818) @@ -1,6 +1,6 @@ <?php /* - * Created on Nov 20, 2007 + * Created on February 08, 2008 */ @@ -18,7 +18,7 @@ $this->logsObj = new logsClass($this->db, 'Upgrade'); $this->gfObj = new cs_globalFunctions; - $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; + $this->gfObj->debugPrintOpt = 1; }//end __construct() //========================================================================= @@ -27,16 +27,48 @@ //========================================================================= public function run_upgrade() { - $this->db->beginTrans(__METHOD__); - + $this->update_config_file(); exit; $this->db->commitTrans(__METHOD__); }//end run_upgrade() //========================================================================= + + + + //========================================================================= + public function update_config_file() { + $fs = new cs_fileSystemClass(dirname(__FILE__) .'/../'); + $sampleXmlObj = new XMLParser($fs->read('docs/samples/sample_config.xml')); + $siteXmlObj = new XMLParser($fs->read('lib/config.xml')); + + $updateXml = new xmlCreator(); + $updateXml->load_xmlparser_data($siteXmlObj); + + $sampleIndexes = $sampleXmlObj->get_tree(TRUE); + $sampleIndexes = $sampleIndexes['CONFIG']; + $siteConfigIndexes = $siteXmlObj->get_tree(TRUE); + + foreach($sampleIndexes as $indexName=>$indexValue) { + $path = '/CONFIG/'. $indexName; + $attributes = $sampleXmlObj->get_attribute($path); + #debug_print(__METHOD__ .": attributes from sample (/CONFIG/". $indexName ."::: ",1); + #debug_print($attributes,1); + + if(is_array($attributes)) { + $updateXml->add_attribute($path, $attributes); + } + } + + $this->gfObj->debug_print($updateXml->create_xml_string()); + $fs->openFile('lib/_test_config.xml'); + $fs->write($updateXml->create_xml_string()); + exit; + }//end update_config_file() + //========================================================================= } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2008-02-09 05:33:33
|
Revision: 817 http://cs-project.svn.sourceforge.net/cs-project/?rev=817&view=rev Author: crazedsanity Date: 2008-02-08 21:33:30 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Upgrade locks config again, plus more debug printing. Modified Paths: -------------- trunk/1.2/lib/upgradeClass.php Modified: trunk/1.2/lib/upgradeClass.php =================================================================== --- trunk/1.2/lib/upgradeClass.php 2008-02-09 04:23:14 UTC (rev 816) +++ trunk/1.2/lib/upgradeClass.php 2008-02-09 05:33:30 UTC (rev 817) @@ -190,7 +190,7 @@ throw new exception(__METHOD__ .": upgrade already in progress...????"); } else { - $lockConfig = $this->upgrade_in_progress(); + $lockConfig = $this->upgrade_in_progress(TRUE); $this->fsObj->cd("/"); //TODO: not only should the "create_file()" method be run, but also do a sanity check by calling lock_file_exists(). @@ -445,6 +445,7 @@ //version-only upgrade. $this->update_database_version($this->versionFileVersion); $this->newVersion = $this->versionFileVersion; + $this->gfObj->debug_print(__METHOD__ .": doing version-only upgrade..."); } else { $scriptIndex = $versionIndex; @@ -466,6 +467,7 @@ throw new exception(__METHOD__ .": target version not specified, unable to proceed with upgrade for ". $versionIndex); } } + $this->gfObj->debug_print(__METHOD__ .": done... "); }//end do_single_upgrade() //========================================================================= @@ -560,6 +562,7 @@ //we've got the filename, see if it exists. $fileName = UPGRADE_DIR .'/'. $myConfigFile; if(file_exists($fileName)) { + $this->gfObj->debug_print(__METHOD__ .": file exists... "); $createClassName = $upgradeData['CLASS_NAME']; $classUpgradeMethod = $upgradeData['CALL_METHOD']; require_once($fileName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |