- reintegrated the changes (mostly bug fixes) from the 0.7.2 branch

SVN:code[83]
This commit is contained in:
Denis Flaven
2009-07-18 17:24:25 +00:00
parent 62fa1bfbf6
commit 4eb723b073
30 changed files with 114 additions and 105 deletions

View File

@@ -243,22 +243,17 @@ switch($operation)
$oP->add_linked_script("../js/jquery.blockUI.js");
$oWizard = new UIWizard($oP, $sClass, $sStateCode);
$sStateCode = $oWizard->GetTargetState(); // Will computes the default state if none was supplied
$sClassLabel = MetaModel::GetName($sClass);
$oP->p("<h2>Creation of a new $sClassLabel</h2>");
if (!empty($sStateCode))
{
$aStates = MetaModel::EnumStates($sClass);
$sStateLabel = $aStates[$sStateCode]['label'];
$oP->p("Wizard for creating an object of class '$sClass' in state '$sStateCode'.");
}
else
{
// Stateless object
$oP->p("Wizard for creating an object of class '$sClass'.");
}
$aWizardSteps = $oWizard->GetWizardStructure();
// Display the structure of the wizard
$iStepIndex = 1;
$oP->p("<h2>Wizard Steps for creating an object of class '$sClass' in state '$sStateCode'</h2>\n");
$iMaxInputId = 0;
$aFieldsMap = array();
foreach($aWizardSteps['mandatory'] as $aSteps)

View File

@@ -1,8 +0,0 @@
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
<ShortName>iTop</ShortName>
<Contact>webmaster@itop.com</Contact>
<Description>Recherche dans iTop</Description>
<InputEncoding>ISO-8859-1</InputEncoding>
<Url type="text/html" method="get" template="http://localhost:81/pages/UI.php?text={searchTerms}&amp;operation=full_text"/>
<moz:SearchForm>http://localhost:81/pages/UI.php</moz:SearchForm>
</OpenSearchDescription>

View File

@@ -160,7 +160,7 @@ function DisplayLifecycle($oPage, $sClass)
{
$aStates = MetaModel::EnumStates($sClass);
$aStimuli = MetaModel::EnumStimuli($sClass);
$oPage->add("<img src=\"/pages/graphviz.php?class=$sClass\">\n");
$oPage->add("<img src=\"../pages/graphviz.php?class=$sClass\">\n");
$oPage->add("<h3>Transitions</h3>\n");
$oPage->add("<ul>\n");
foreach ($aStates as $sStateCode => $aStateDef)