Skip to content
Snippets Groups Projects
Commit 4173769f authored by hahn's avatar hahn
Browse files

- project overview page:

  - scrolling
  - no detail button
  - smaller folder image
- Scroll to top of page
- delete project: red button
- removed builld and cleanup from menu
parent 38fd7cde
No related branches found
No related tags found
No related merge requests found
......@@ -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&uuml;r Puppet Agent",
"inactive": "inaktiv",
"info": "Info",
......
......@@ -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",
......
......@@ -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";
......
......@@ -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>
';
......
......@@ -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"),
),
),
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment