From f17896d90a6fb491ff791474e201ca0688ddda0d Mon Sep 17 00:00:00 2001 From: "Hahn Axel (hahn)" <axel.hahn@iml.unibe.ch> Date: Thu, 11 May 2017 09:48:25 +0200 Subject: [PATCH] CI Webgui: remove ssh proxy in the settings; expandable headline got an icon --- .../deployment/classes/project.class.php | 8 +++++-- public_html/deployment/main.css | 22 ++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 24f1db29..c5be0e3e 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -3214,11 +3214,14 @@ class project extends base { 'checked' => $sDeploymethod==="puppet", 'onclick' => '$(\'#'.$sDivId4TargetHosts.'\').css(\'display\', (this.checked ? \'block\' : \'none\') )', ), + /* + * see deploy method to handle an action 'sshproxy' => array( 'label' => t("deploymethod-sshproxy"), 'checked' => $sDeploymethod==="sshproxy", 'onclick' => '$(\'#'.$sDivId4TargetHosts.'\').css(\'display\', (this.checked ? \'block\' : \'none\') )', ), + */ ), ); @@ -3284,11 +3287,12 @@ class project extends base { ); $aReplacements=$oConfig->getReplacements($sPhase); + $sDivIdReplacement='divreplacements-'.$sPhase; $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'markup', 'value' => '<div style="clear: both; height: 2em;"></div>' . '<div class="form-group">' - . '<a href="#" '. ($aReplacements ? 'onclick="$(\'.divreplacements-'.$sPhase.'\').slideToggle(); return false;"' : '' ) + . '<a class="expandable closed" href="#" '. ($aReplacements ? 'onclick="$(\'#'.$sDivIdReplacement.'\').slideToggle(); $(this).toggleClass(\'closed\'); return false;"' : '' ) . '><h3>'.t("replacements").' ('.($aReplacements ? count($aReplacements):0).')</h3></a>' . t('replacements-info') . '</div>' @@ -3297,7 +3301,7 @@ class project extends base { if ($aReplacements){ $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'markup', - 'value' => '<div class="divreplacements-'.$sPhase.'" style="display: none;">' + 'value' => '<div id="'.$sDivIdReplacement.'" style="display: none;">' ); foreach($aReplacements as $sFile=>$aFields){ $tTplFile=basename($sFile); diff --git a/public_html/deployment/main.css b/public_html/deployment/main.css index 0ba81f27..342dc401 100644 --- a/public_html/deployment/main.css +++ b/public_html/deployment/main.css @@ -1,4 +1,3 @@ - body{padding-top: 0;} #header,#footer{ background:#eee; background: linear-gradient(#fff,#eee); @@ -140,6 +139,27 @@ td.highlight{background:rgba(255,220,50,0.5) !important;} .preview, .stage, .live{ } +a.expandable:before{ + /* + border: 1px solid #aaa; + border-radius: 0.3em; + */ + color:#a00; + content: '+'; + float: left; + font-size: 150%; + margin-right: 0em; + text-align: center; + transition: ease-in 0.3s; + transform: rotate(-45deg); + width: 1em; +} +a.closed:before{ + color:#067; + content: '+'; + transform: rotate(0deg); +} + a.info { border-bottom: 1px dotted; padding-bottom: 2px;} a.info:hover { text-decoration: none; background: #fff;} a.infoAsModal>span {display: none;} -- GitLab