diff --git a/config/lang/de.json b/config/lang/de.json index 13ca049980b37ad687d74fa466a035bb061b1bab..24e3d9faccdfbecc23c8b36797e2cb49b9bc50d7 100644 --- a/config/lang/de.json +++ b/config/lang/de.json @@ -211,6 +211,7 @@ "fileprefix": "File Prefix", "fileprefix-label": "File-Prefix <span class=\"error\"><br>Nach dem ersten Build nicht mehr änderbar!</span>", "finished": "Beendet", + "gotop": "Seitenanfang", "hostname4puppet": "Hostname für Puppet Agent", "inactive": "inaktiv", "info": "Info", diff --git a/config/lang/en.json b/config/lang/en.json index 69923fd266fa885862c28c20694ae95a37357124..5f09083f13bfe68e5384ac391716c7e3f9e6f58e 100644 --- a/config/lang/en.json +++ b/config/lang/en.json @@ -213,6 +213,7 @@ "fileprefix": "File prefix", "fileprefix-label": "File prefix <span class=\"error\"><br>It cannot be changed after the first build!</span>", "finished": "Fisnished", + "gotop": "top", "hostname4puppet": "Hostname to start puppet agent", "inactive": "inactive", "info": "Info", diff --git a/public_html/deployment/classes/formgen.class.php b/public_html/deployment/classes/formgen.class.php index e99a2663127d003e2b5ac28a166de9911410e0b7..924a2e8fb36a91f517a39bb695293907e4228ab8 100644 --- a/public_html/deployment/classes/formgen.class.php +++ b/public_html/deployment/classes/formgen.class.php @@ -231,7 +231,12 @@ class formgen { case "submit": $this->_checkReqiredKeys($elementData, array("value")); - $sFormElement.=' <button id="' . $sId . '" class="btn btn-large btn-primary" type="submit" '; + $sClass="btn btn-primary "; + if (array_key_exists("class", $elementData)){ + $sClass.=$elementData["class"]; + } + $elementData["class"]=$sClass; + $sFormElement.=' <button id="' . $sId . '" type="submit" '; $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes"), $elementData); $sFormElement.='>' . $elementData["value"] . '</button>'; $sFormElement.="\n"; diff --git a/public_html/deployment/inc_functions.php b/public_html/deployment/inc_functions.php index 44a71d63e121f1da7566a3540dd1ed06bb1d7042..abd8bf8bf3491e73707a3b9bedfb223c110a279c 100644 --- a/public_html/deployment/inc_functions.php +++ b/public_html/deployment/inc_functions.php @@ -87,6 +87,14 @@ function aPrjHome($sClass = "btn") { $oPrj = new project($aParams["prj"]); return '<a href="/deployment/' . $aParams["prj"] . '/" class="' . $sClass . '"><i class="icon-book"></i> ' . t("menu-project-home") . ' <strong>' . $oPrj->getLabel() . '</strong></a>'; } +/** + * get go top link as button + * @return string + */ +function aGotop($sClass = "scroll-link btn") { + return '<a href="#top" class="' . $sClass . '" title="'.t("gotop").'"><i class="icon-eject"></i> </a> '; +} + /** * auto generate upper part of the page with header and navigation @@ -122,6 +130,7 @@ function getTopArea() { $sBaseUrl = '/deployment/'; $sWikiBaseUrl = 'https://secure.iml.unibe.ch/wiki/doku.php'; $sReturn = ' + <span id="top"></span> <div class="navbar"> <span class="version ' . $sPhase . '">' . $sPhase . ' :: ' . $sMyRev . '</span> <div class="navbar-inner"> @@ -162,8 +171,10 @@ function getTopArea() { <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">' . t("menu-project-actions") . '<b class="caret"></b></a> <ul class="dropdown-menu"> + <!-- <li><a href="' . $sBaseUrl . $aParams["prj"] . '/build/">' . t("menu-project-build") . '</a></li> <li><a href="' . $sBaseUrl . $aParams["prj"] . '/cleanup/">' . t("menu-project-cleanup") . '</a></li> + --> <li><a href="' . $sBaseUrl . $aParams["prj"] . '/setup/">' . t("menu-project-settings") . '</a></li> <li><a href="' . $sBaseUrl . $aParams["prj"] . '/delete/">' . t("menu-project-delete") . '</a></li> '; diff --git a/public_html/deployment/pages/act_delete.php b/public_html/deployment/pages/act_delete.php index ba14c65a4346da5379f8d024e4ef2806e80dfc8a..28fb0f007af6070ba556ce8363ca0be1e8b8be69 100644 --- a/public_html/deployment/pages/act_delete.php +++ b/public_html/deployment/pages/act_delete.php @@ -70,6 +70,7 @@ if (!array_key_exists("confirm", $aParams)) { ), 'button' . $i++ => array( 'type' => 'submit', + 'class' => 'btn-danger', 'value' => '<b class="icon-remove"></b> ' . t("page-delete-project-buttonlabel"), ), ), diff --git a/public_html/deployment/pages/act_overview.php b/public_html/deployment/pages/act_overview.php index fa08c0b69ae73f3c74a1c291b218c05190bfa56c..261bb3a239ff847d30de872cebe7cc2631f15df8 100644 --- a/public_html/deployment/pages/act_overview.php +++ b/public_html/deployment/pages/act_overview.php @@ -58,7 +58,7 @@ if (!array_key_exists("prj", $aParams)) { $oPrj->renderLink("setup"); } $sOut .= '<div style="clear: both"></div> - <div id="navbuttom">' . aHome() . '</div>'; + <div id="navbuttom">' . aGotop() . aHome() . '</div>'; } // echo $sOut;