diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 018820754a9d7dcb3aa0b2799868a058a8855774..0000000000000000000000000000000000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,24 +0,0 @@ -auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= -auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false -auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css -auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= -auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false -auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css -auxiliary.org-netbeans-modules-php-phpunit.bootstrap_2e_create_2e_tests=false -auxiliary.org-netbeans-modules-php-phpunit.bootstrap_2e_path= -auxiliary.org-netbeans-modules-php-phpunit.configuration_2e_path= -auxiliary.org-netbeans-modules-php-phpunit.customSuite_2e_path= -auxiliary.org-netbeans-modules-php-phpunit.phpUnit_2e_path= -auxiliary.org-netbeans-modules-php-phpunit.test_2e_groups_2e_ask=false -auxiliary.org-netbeans-modules-php-phpunit.test_2e_run_2e_all=false -auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=public_html/deployment/bootstrap/js -browser.reload.on.save=true -ignore.path= -include.path=\ - ${php.global.include.path} -php.version=PHP_53 -source.encoding=UTF-8 -src.dir=. -tags.asp=false -tags.short=false -web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index eaa86ca10b6cdc42bfc29811fc115b5e729788ca..0000000000000000000000000000000000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://www.netbeans.org/ns/project/1"> - <type>org.netbeans.modules.php.project</type> - <configuration> - <data xmlns="http://www.netbeans.org/ns/php-project/1"> - <name>deployment-gui</name> - </data> - </configuration> -</project> diff --git a/public_html/deployment/classes/formgen.class.php b/public_html/deployment/classes/formgen.class.php index bff052c643fdac5bbfd2c466bdc96426d015ebd4..61d841a64b645e9d77f595538fb87d11951f5ac4 100644 --- a/public_html/deployment/classes/formgen.class.php +++ b/public_html/deployment/classes/formgen.class.php @@ -161,10 +161,12 @@ class formgen { $sFormElement.='/><label for="' . $sOptionId . '">' . $aOptionData["label"] . '</label></div>'; } $sFormElement.="\n"; - $sLabelElement.='<span class="help-block">' . $sLabelText . '</span>'; + // $sLabelElement.='<span class="help-block">' . $sLabelText . '</span>'; + $sLabelElement.='<div class="col-sm-2">' . $sLabelText . '</div>'; $sLabelElement.="\n"; - $sHtmlDefault = $sLabelElement . $sFormElement; + // $sHtmlDefault = $sLabelElement . $sFormElement; + $sHtmlDefault = $sLabelElement . '<div class="col-sm-10">' . "\n" . $sFormElement . '</div>' . "\n"; $sHtmlTable = '<td>' . $sLabelText . '</td><td>' . $sFormElement . '</td>'; break; @@ -197,11 +199,15 @@ class formgen { $sFormElement.="\n"; if ($sLabelText) { - $sLabelElement.='<span class="help-block">' . $sLabelText . '</span>' . "\n"; + // $sLabelElement.='<span class="help-block">' . $sLabelText . '</span>' . "\n"; + $sLabelElement = $this->_addLabel($sLabelText, $sId, "col-sm-2"); } + // $sHtmlDefault = $sLabelElement . $sFormElement; + $sHtmlDefault = $sLabelElement . '<div class="col-sm-10">' . "\n" . $sFormElement . '</div>' . "\n"; + $sHtmlTable = '<td>' . $sLabelText . '</td><td>' . $sFormElement . '</td>'; - $sHtmlDefault = $sLabelElement . $sFormElement; + // $sHtmlDefault = $sLabelElement . $sFormElement; // $sReturn.=$this->_addLabel($sFormElement,$sId,"checkbox"); break; diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 69b648b2b66e1c6d7c9e07a4f4de7058057b389c..54d5f566dea56b8f24683bd2a4f98ed018e3b9dc 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -2784,6 +2784,7 @@ class project extends base { <li class="active"><a href="#tab1" data-toggle="tab">' . t('setup-metadata') . '</a></li> <li><a href="#tab2" data-toggle="tab">' . t('build') . '</a></li> <li><a href="#tab3" data-toggle="tab">' . t('phases') . '</a></li> + <li><a href="#tab3" data-toggle="tab">' . t('deployment') . '</a></li> </ul> <div class="tab-content"> <div class="tab-pane active" id="tab1"> @@ -2928,7 +2929,8 @@ class project extends base { $sCmd2 = 'ssh ' . $this->_aConfig["installPackages"]["user"] . '@' . $sPuppethost . ' ' . $this->_aConfig["installPackages"]["testcommand"]; - $sOut = shell_exec($sCmd2); + $sOut = 'skip'; + // $sOut = shell_exec($sCmd2); // Check auf Versionsnummer - mehr als n Zeichen ist mutmasslich eine Fehlermeldung if (strlen($sOut) > 7) { $sMessages.=$this->getBox("error", sprintf(t("class-project-error-setup-sudo-pupet-agent-failed"), $sPhase, $sCmd, $sOut)); @@ -2944,6 +2946,45 @@ class project extends base { . '</div></div>', ); } + + + $aForms["setup"]["form"]['input' . $i++] = array( + 'type' => 'text', + 'name' => 'phases[' . $sPhase . '][hosts]', + 'label' => t("hosts"), + 'value' => $sPuppethost, + // 'required' => 'required', + 'validate' => 'isastring', + 'size' => 100, + 'placeholder' => 'FQDN1,FQDN2,...', + ); + $aForms["setup"]["form"]['input' . $i++] = array( + 'type' => 'radio', + 'name' => 'phases[' . $sPhase . '][deploymethod]', + 'label' => t("deploymethod"), + // 'value' => $bUsePuppet, + 'required' => 'required', + 'validate' => 'isastring', + // 'size' => 100, + // 'placeholder' => '...', + 'options' => array( + 'none' => array( + 'label' => t("none"), + 'checked' => false, + ), + 'puppet' => array( + 'label' => t("usepuppet"), + 'checked' => false, + ), + 'sshproxy' => array( + 'label' => t("sshproxy"), + 'checked' => false, + ), + ), + + ); + + // when to deploy $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'text', 'name' => 'phases[' . $sPhase . '][deploytimes]', diff --git a/public_html/deployment/main.css b/public_html/deployment/main.css index cb449eb2bc15e4b30e91ab6e44ab6233b53c2baa..67fafd5bb90781d37d76369e386a89ed6bc05205 100644 --- a/public_html/deployment/main.css +++ b/public_html/deployment/main.css @@ -68,7 +68,6 @@ h2.action{ height: 2.7em; margin: 0 0 1em 0; font-size: 250%; } -/* h2.accept{background-image: url("/deployment/images/nuvola64x64/apps/korganizer.png");} h2.build{background-image: url("/deployment/images/nuvola64x64/apps/kthememgr.png");} h2.cleanup{background-image: url("/deployment/images/nuvola64x64/apps/kasteroids.png");} @@ -77,7 +76,6 @@ h2.prjhome{background-image: url("/deployment/images/nuvola64x64/apps/kdict.png" h2.phase{background-image: url("/deployment/images/nuvola64x64/apps/kreversi.png");} h2.setup{background-image: url("/deployment/images/nuvola64x64/apps/kcmsystem.png");} h2.login{background-image: url("/deployment/images/nuvola64x64/apps/kgpg.png");} -*/ h3{color:#444; margin-top: 3em;} h3:first-child{margin-top: 0;} @@ -139,7 +137,9 @@ td.highlight{background:rgba(255,220,50,0.5) !important;} a.info { border-bottom: 1px dotted; padding-bottom: 2px;} a.info:hover { text-decoration: none; background: #fff;} -a.info>span{ display: none; position: absolute; margin-top: -1em; margin-left: -130px; background: #fff; padding: 0.5em; box-shadow: 0 0 10px #888; text-align: left; +a.info>span{ background: #fff; box-shadow: 0 0 10px #888; display: none; + margin-left: -150px; margin-top: -1em; padding: 0.5em; + position: absolute; text-align: left; z-index: 100; } a.info>span.left{margin-left: 0;} @@ -219,4 +219,4 @@ input[type="radio"]:checked+label, input[type="checkbox"]:checked+label{ div.logs{ margin-top: 1em; padding: 0.5em 0; text-align: left; -} \ No newline at end of file +}