Skip to content
Snippets Groups Projects
Commit e3fbc7c1 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

html fixes

parent e2d6f26b
No related branches found
No related tags found
1 merge request!62V2.0
......@@ -282,7 +282,7 @@ class Actionlog {
);
$aForms["filter"]["form"]['line'] = array(
'type' => 'markup',
'value' => '</div><div><hr>',
'value' => '<div><hr>',
);
......
......@@ -226,7 +226,8 @@ class formgen {
// HINWEIS optgroups werden nicht unterstuezt - nur einfache Listen
$this->_checkReqiredKeys($elementData, array("name"));
$sDivClass=(isset($elementData["inline"]) && $elementData["inline"])?"form-group":"col-sm-10";
$sFormElement.='<div class="'.$sDivClass.'"><select id="' . $sId . '" class="form-control" ';
$elementData['class'].=" form-control";
$sFormElement.='<div class="'.$sDivClass.'">'."\n".'<select id="' . $sId . '" ';
$sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,name,onchange"), $elementData);
$sFormElement.=">\n";
foreach ($elementData["options"] as $idOption => $aOptionData) {
......
......@@ -1229,7 +1229,7 @@ class projectgui extends project {
$aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'markup',
'value' => ''
. '<div id="' . $sDivId4PhaseSettings . '" ' . ($bActivePhase ? '' : ' style="display: none;"') . '">'
. '<div id="' . $sDivId4PhaseSettings . '" ' . ($bActivePhase ? '' : ' style="display: none;"') . '>'
);
$aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'text',
......@@ -1277,7 +1277,7 @@ class projectgui extends project {
$aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'markup',
'value' => ''
. '<div id="' . $sDivId4TargetHosts . '" ' . ($sDeploymethod !== "none" ? '' : ' style="display: none;"') . '">'
. '<div id="' . $sDivId4TargetHosts . '" ' . ($sDeploymethod !== "none" ? '' : ' style="display: none;"') . '>'
);
// rollout plugin: phase specific overrides
......
......@@ -236,7 +236,7 @@ class rollout_base implements iRolloutplugin{
if(isset($aEffectiveConfig[$sVarname]) && isset($aCallbackData[$aEffectiveConfig[$sVarname]])){
$aCallbackData[$aEffectiveConfig[$sVarname]]['selected']='selected';
$aCallbackData[$aEffectiveConfig[$sVarname]]['checked']='checked';
$aCallbackData[$aEffectiveConfig[$sVarname]]['label'].=' <<<';
$aCallbackData[$aEffectiveConfig[$sVarname]]['label'].=' &laquo;&laquo;';
} elseif ($aVarinfos['type']==='select') {
$aCallbackData=array_merge(array('NO_SELECTED_ITEM_YET'=>array('value'=>'', 'label'=>'...')), $aCallbackData);
}
......
......@@ -39,19 +39,23 @@ $sAction = "overview";
// check params
// ----------------------------------------------------------------------
$oCLog->add("parsing params "
. '<pre>GET '.print_r($_GET, true).'</pre>'
. '<pre>POST '.print_r($_POST, true).'</pre>'
. '<pre>aParams: '.print_r($aParams, true).'</pre>'
);
if (array_key_exists("prj", $aParams)) {
$sPrj = $aParams["prj"];
}
if (array_key_exists("action", $aParams)) {
if (file_exists(__DIR__ . '/pages/act_' . $aParams["action"] . ".php")) {
if (isset($aParams["action"])) {
$sPagefile=__DIR__ . '/pages/act_' . $aParams["action"] . ".php";
if (file_exists($sPagefile)) {
$sAction = $aParams["action"];
} else {
$oCLog->add("does not exist: $sPagefile");
}
}
$oCLog->add("parsing params "
. '<pre>GET '.print_r($_GET, true).'</pre>'
. '<pre>POST '.print_r($_POST, true).'</pre>'
. '<pre>aParams: '.print_r($aParams, true).'</pre>'
);
if($bFirstRun){
$sAction='installer';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment