[icinga-checkins] icinga.org: icinga-web/cdoebler/default: * CSS changes for the body
git at icinga.org
git at icinga.org
Tue Oct 20 15:43:21 CEST 2009
Module: icinga-web
Branch: cdoebler/default
Commit: ec70d93682e894552fcfd5045330a5380235e64c
URL: https://git.icinga.org/?p=icinga-web.git;a=commit;h=ec70d93682e894552fcfd5045330a5380235e64c
Author: Marius Hein <marius.hein at netways.de>
Date: Mon Oct 19 17:27:02 2009 +0200
* CSS changes for the body
* Better site title
* Login links and user logged in notice
* Typo for portal cronks
---
app/config/cronks.xml | 2 +-
app/modules/AppKit/templates/AjaxLoginSuccess.php | 2 +-
.../AppKit/templates/Widgets/ShowFooterSuccess.php | 2 +-
.../AppKit/templates/Widgets/ShowNavigationTop.php | 14 ++++++++++++--
.../AppKit/views/AjaxLoginSuccessView.class.php | 2 +-
app/templates/ICINGAWireFrameMaster.php | 2 +-
pub/styles/WireFrameStructural.css | 20 +++++++++++++++++++-
7 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/app/config/cronks.xml b/app/config/cronks.xml
index 1d857e9..84d773d 100644
--- a/app/config/cronks.xml
+++ b/app/config/cronks.xml
@@ -123,7 +123,7 @@
<parameter name="action">System.PortalView</parameter>
<parameter name="hide">false</parameter>
<parameter name="description">Portalgrid 1 column</parameter>
- <parameter name="name">Portal 1columns</parameter>
+ <parameter name="name">Portal 1column</parameter>
<parameter name="image">cronks.portal</parameter>
<parameter name="parameter">
<parameter name="columns">1</parameter>
diff --git a/app/modules/AppKit/templates/AjaxLoginSuccess.php b/app/modules/AppKit/templates/AjaxLoginSuccess.php
index 07a505f..8873227 100644
--- a/app/modules/AppKit/templates/AjaxLoginSuccess.php
+++ b/app/modules/AppKit/templates/AjaxLoginSuccess.php
@@ -2,7 +2,7 @@
$htmlid = AppKitRandomUtil::genSimpleId(10, 'login-box-');
$containerid = AppKitHtmlHelper::concatHtmlId($htmlid, 'container');
?>
-<div style="width:400px; margin: 150px auto 150px auto; padding: 20px;" id="<?php echo $containerid; ?>">
+<div style="width:400px; margin: 150px auto 0px auto; padding: 20px;" id="<?php echo $containerid; ?>">
<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>
<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc">
<h3 style="margin-bottom:5px;"><?php echo $tm->_('Login'); ?></h3>
diff --git a/app/modules/AppKit/templates/Widgets/ShowFooterSuccess.php b/app/modules/AppKit/templates/Widgets/ShowFooterSuccess.php
index 2b93b62..a1e7cd1 100755
--- a/app/modules/AppKit/templates/Widgets/ShowFooterSuccess.php
+++ b/app/modules/AppKit/templates/Widgets/ShowFooterSuccess.php
@@ -1,5 +1,5 @@
<div class="footerContent">
-«<span style="font-weight: bolder; color: #f39a00;">ICINGA</span>»
+«<span style="font-weight: bolder; color: #f39a00;">icinga</span>»
• <?php echo AgaviConfig::get('de.icinga.appkit.version.release'); ?>
(<?php echo AgaviConfig::get('agavi.release'); ?>)
• <?php echo AgaviConfig::get('de.icinga.appkit.version.copyright'); ?>
diff --git a/app/modules/AppKit/templates/Widgets/ShowNavigationTop.php b/app/modules/AppKit/templates/Widgets/ShowNavigationTop.php
index 40a6f60..b725e6c 100755
--- a/app/modules/AppKit/templates/Widgets/ShowNavigationTop.php
+++ b/app/modules/AppKit/templates/Widgets/ShowNavigationTop.php
@@ -70,6 +70,16 @@ YAHOO.util.Event.onContentReady("yahooTopMenu", function () {
</div>
<?php } ?>
<a href="http://www.icinga.org/" target="_blank"><div id="icinga-logo-top"></div></a>
-<div id="rss-top"><?php echo AppKitHtmlHelper::Obj()->Image('icons.rss'); ?></div>
-<div id="links-top">User icinga | Logout | Help</div>
+<!-- <div id="rss-top"><?php echo AppKitHtmlHelper::Obj()->Image('icons.rss'); ?></div> -->
+<div id="links-top">
+
+<?php if ($us->isAuthenticated()) { ?>
+ <?php echo $tm->_('User')?>: <?php echo $us->getNsmUser()->givenName(); ?>
+ | <a href="<?php echo $ro->gen('appkit.logout'); ?>">Logout</a>
+<?php } else { ?>
+ <?php echo $tm->_('User')?>: <?php echo $tm->_('Guest')?>
+<?php } ?>
+
+</div>
+
</div>
\ No newline at end of file
diff --git a/app/modules/AppKit/views/AjaxLoginSuccessView.class.php b/app/modules/AppKit/views/AjaxLoginSuccessView.class.php
index d4ffa12..ea4fe17 100644
--- a/app/modules/AppKit/views/AjaxLoginSuccessView.class.php
+++ b/app/modules/AppKit/views/AjaxLoginSuccessView.class.php
@@ -5,7 +5,7 @@ class AppKit_AjaxLoginSuccessView extends ICINGAAppKitBaseView
public function executeHtml(AgaviRequestDataHolder $rd)
{
$this->setupHtml($rd);
- $this->setAttribute('title', 'Login');
+ // $this->setAttribute('title', 'Login');
}
public function executeJson(AgaviRequestDataHolder $rd) {
diff --git a/app/templates/ICINGAWireFrameMaster.php b/app/templates/ICINGAWireFrameMaster.php
index 47f62df..9be3187 100755
--- a/app/templates/ICINGAWireFrameMaster.php
+++ b/app/templates/ICINGAWireFrameMaster.php
@@ -25,7 +25,7 @@
<?php echo $slots['navigation_left']; ?>
<div id="contentArea">
- <?php if(isset($t['title'])) echo '<h1>' . htmlspecialchars($t['title']) . '</h1>'; ?>
+ <?php if(isset($t['title'])) echo '<h1 class="pageTitle">' . htmlspecialchars($t['title']) . '</h1>'; ?>
<?php echo $slots['error_frame']; ?>
diff --git a/pub/styles/WireFrameStructural.css b/pub/styles/WireFrameStructural.css
index 9f515f2..087c80c 100755
--- a/pub/styles/WireFrameStructural.css
+++ b/pub/styles/WireFrameStructural.css
@@ -46,6 +46,11 @@ table {
}
*/
+h1.pageTitle {
+ margin: 10px 10px 10px 10px;
+ font-size: 11pt;
+}
+
table.structural {
margin: 0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
@@ -81,7 +86,7 @@ fieldset legend {
}
*/
body#default {
- background-color: #ccc;
+ background-color: #fff;
}
div#main-container {
@@ -100,9 +105,22 @@ div#frameMiddle {
}
div#frameBottom {
+
+ position: absolute;
+ bottom: 0px;
+ right: 10px;
+
border-top: 1px #c0c0c0 solid;
+ border-left: 1px #c0c0c0 solid;
+ border-right: 1px #c0c0c0 solid;
+
text-align: right;
padding: 5px;
+
+}
+
+div.footerContent {
+
}
div.footerContent, div.footerContent a {
More information about the icinga-checkins
mailing list