[evolvis-commits] r17345: [#1757] First round of fixes
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Jul 7 12:21:29 CEST 2011
Author: mirabilos
Date: 2011-07-07 12:21:29 +0200 (Thu, 07 Jul 2011)
New Revision: 17345
Modified:
trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/common/JenkinsPlugin.class.php
trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/www/index.php
trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css
trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php
Log:
[#1757] First round of fixes
Modified: trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/common/JenkinsPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/common/JenkinsPlugin.class.php 2011-07-07 09:36:55 UTC (rev 17344)
+++ trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/common/JenkinsPlugin.class.php 2011-07-07 10:21:29 UTC (rev 17345)
@@ -463,7 +463,7 @@
// includes the websites to administer jenkins
// if permission is granted
$permUser = $this->getGroup()->getPermission(session_get_user());
- echo '<div style="height:600px">';
+ echo '<div>';
if ($permUser->isMember()) {
echo '<div class="mainContentBoxes">';
@@ -471,7 +471,7 @@
if ($group->userIsAdmin()) {
// $group object in /plugins/jenkins/www/index.php
// or rather in /www/plugins/jenkins/index.php
- echo '<div class="smallContentBoxes" style="height:500px;">';
+ echo '<div class="smallContentBoxes">';
// Only for admins
include('jenkinsAdministerAdmin.php');
echo "</div>\n";
@@ -493,7 +493,7 @@
// shows the feedback message box
echo "<div class=\"mainContentBoxes\">\n";
- echo $HTML->boxTop(_('Feedback messages.'));
+ echo $HTML->boxTop(_('Feedback messages'));
echo $HTML->boxBottom();
echo "<div style=\"margin-left:14px;\">\n";
@@ -547,10 +547,13 @@
$jenkinsProtocolPrefix = $protocolPrefix;
+ if ($objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ $objRefJenkinsInfo->setConnectionRefusedError(_('Insufficient configuration information.'));
+ return null;
+ }
+
$fp = fsockopen($jenkinsProtocolPrefix.$host, $port, $errno);
-
- if ($errno !== 0 ||
- objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ if ($errno !== 0) {
$objRefJenkinsInfo->setConnectionRefusedError(_('An error on login occurred.'));
return null;
}
@@ -713,10 +716,14 @@
$objRefJenkinsInfo = $this->getObjRefJenkinsInfo();
$jenkinsProtocolPrefix = $protocolPrefix;
+
+ if ($objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ $objRefJenkinsInfo->setConnectionRefusedError(_('Insufficient configuration information.'));
+ return null;
+ }
+
$fp = fsockopen($jenkinsProtocolPrefix.$host, $port, $errno);
-
- if ($errno !== 0 ||
- objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ if ($errno !== 0) {
$objRefJenkinsInfo->setConnectionRefusedError(_('An error on protect creation occurred.'));
return;
}
@@ -783,10 +790,13 @@
$pathSuffix = "/api/xml"; // All jenkins projects
$protocolSuffix = '://';
+ if ($objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ $objRefJenkinsInfo->setConnectionRefusedError(_('Insufficient configuration information.'));
+ return null;
+ }
+
$fp = fsockopen($protocolPrefix.$host, $port, $errno);
-
- if ($errno !== 0 ||
- objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ if ($errno !== 0) {
$objRefJenkinsInfo->setConnectionRefusedError(_('An error occurred on deleting, disabling or enabling the project.'));
return;
}
@@ -1303,10 +1313,14 @@
$objRefJenkinsInfo = $this->getObjRefJenkinsInfo();
$jenkinsProtocolPrefix = $protocolPrefix;
- $fp = fsockopen($jenkinsProtocolPrefix.$host, $port, $errno);
+ if ($objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ $objRefJenkinsInfo->setConnectionRefusedError(_('Insufficient configuration information.'));
+ return null;
+ }
- if ($errno !== 0 || objRefJenkinsInfo->isInsufficientConfigInfo()) {
+ $fp = fsockopen($jenkinsProtocolPrefix.$host, $port, $errno);
+ if ($errno !== 0) {
$objRefJenkinsInfo->setConnectionRefusedError(_('An error occurred on deleting, disabling or enabling the project.'));
return;
}
Modified: trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/www/index.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/www/index.php 2011-07-07 09:36:55 UTC (rev 17344)
+++ trunk/gforge_base/evolvisforge/gforge/plugins/jenkins/www/index.php 2011-07-07 10:21:29 UTC (rev 17345)
@@ -28,7 +28,7 @@
*/
require_once('../../env.inc.php');
-require_once $gfcommon.'include/pre.php';
+require_once $gfwww.'include/pre.php';
$pluginname = 'jenkins';
@@ -46,6 +46,8 @@
$params['group'] = $group_id;
$params['title'] = "Jenkins";
$params['pagename'] = $pluginname;
+$params['toptab'] = "jenkins";
+$params['rightnav'] = true;
echo site_project_header($params);
Modified: trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css 2011-07-07 09:36:55 UTC (rev 17344)
+++ trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css 2011-07-07 10:21:29 UTC (rev 17345)
@@ -598,11 +598,13 @@
.mainContentBoxes {
/* commented out because it's too wide */
/*width:910px;*/
- float:left;
+ /* comment out because this breaks the layout */
+ /*float:left;*/
}
.smallContentBoxes {
- float:left;
+ /* comment out because this breaks the layout */
+ /*float:left;*/
}
/* END: Styles for the Jenkins plugin */
Modified: trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php 2011-07-07 09:36:55 UTC (rev 17344)
+++ trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/Theme.class.php 2011-07-07 10:21:29 UTC (rev 17345)
@@ -244,7 +244,8 @@
"<hr class=\"hidePartForPrinting\" /></div>\n\n";
if (preg_match('!^/(forum|tracker|mail|pm|docman|news|scm|frs|project/admin|projects)!',
- $_SERVER['REQUEST_URI'])) {
+ $_SERVER['REQUEST_URI']) ||
+ util_ifsetor($params['rightnav'])) {
$this->rightnav = true;
?>
<table class="project_papa"><tr class="ff"><td class="project_content"><!-- end header -->
More information about the evolvis-commits
mailing list