Author: david
Date: 2008-10-21 12:01:51 -0700 (Tue, 21 Oct 2008)
New Revision: 1483
Modified:
trunk/qubit/apps/qubit/templates/layout.php
trunk/qubit/data/fixtures/sampleData.yml
trunk/qubit/web/css/graphic.css
Log:
Move website name and description for Qubit out of
apps/qubit/templates/layout.php and into database to allow easier localization
and theming. Related to issue #478.
Modified: trunk/qubit/apps/qubit/templates/layout.php
===================================================================
--- trunk/qubit/apps/qubit/templates/layout.php 2008-10-21 18:54:20 UTC (rev
1482)
+++ trunk/qubit/apps/qubit/templates/layout.php 2008-10-21 19:01:51 UTC (rev
1483)
@@ -12,8 +12,7 @@
</head>
<body class="yui-skin-sam">
-<div id="body-banner-top">
-</div>
+<div id="body-banner-top"></div>
<div id="body-page">
@@ -37,10 +36,18 @@
</div> <!--close header-top -->
<div id="header-middle">
+<?php if (strlen(sfConfig::get('app_site_information_site_title'))): ?>
<div id="website-name">
-<?php echo link_to('<span style="color: #FC6E3C; letter-spacing:
-0.1ex;"><span style="color: #CC3204; font-size: 115%;">Q</span>ubit</span>',
'/homepage/') ?>
+ <?php echo link_to(__(sfConfig::get('app_site_information_site_title')),
'/homepage/') ?>
</div>
-<div id="website-description"><?php echo __("open information management
toolkit"); ?></div>
+<?php endif; ?>
+
+<?php if (strlen(sfConfig::get('app_site_information_site_description'))): ?>
+<div id="website-description">
+ <?php echo __(sfConfig::get('app_site_information_site_description')); ?>
+</div>
+<?php endif; ?>
+
<div id="logo"><?php echo link_to(image_tag('logo', array('alt' =>
sfConfig::get('app_name', 'Qubit'))), '/homepage/') ?></div>
</div> <!-- close header-middle -->
Modified: trunk/qubit/data/fixtures/sampleData.yml
===================================================================
--- trunk/qubit/data/fixtures/sampleData.yml 2008-10-21 18:54:20 UTC (rev
1482)
+++ trunk/qubit/data/fixtures/sampleData.yml 2008-10-21 19:01:51 UTC (rev
1483)
@@ -3194,6 +3194,20 @@
deleteable: '0'
source_culture: en
value: { en: '1' }
+ QubitSetting_site_title:
+ name: site_title
+ scope: site_information
+ editable: '1'
+ deleteable: '0'
+ source_culture: en
+ value: { en: '<span style="color: #CC3204; font-size: 115%;">Q</span>ubit'
}
+ QubitSetting_site_description:
+ name: site_description
+ scope: site_information
+ editable: '1'
+ deleteable: '0'
+ source_culture: en
+ value: { en: 'open information management toolkit' }
QubitSetting_4:
name: informationobject_edit
scope: default_template
Modified: trunk/qubit/web/css/graphic.css
===================================================================
--- trunk/qubit/web/css/graphic.css 2008-10-21 18:54:20 UTC (rev 1482)
+++ trunk/qubit/web/css/graphic.css 2008-10-21 19:01:51 UTC (rev 1483)
@@ -13,47 +13,46 @@
#website-name
{
-font: bold 64px/78px verdana, georgia, garamond, serif;
-letter-spacing: 3px;
-color: #04025C;
-border: 0;
-margin-bottom: 3px;
-text-align: left;
-float: left;
-/*background-image: url(../images/background.gif);*/
+ font: bold 64px/78px verdana, georgia, garamond, serif;
+ letter-spacing: -0.1ex;
+ color: #FC6E3C;
+ border: 0;
+ margin-bottom: 3px;
+ text-align: left;
+ float: left;
}
#website-name a:hover, #website-name a:link, #website-name a:visited,
#website-name a:active
{
-text-decoration: none;
-border: 0;
-color: #04025C;
-background-color: transparent;
+ text-decoration: none;
+ border: 0;
+ color: #FC6E3C;
+ background-color: transparent;
}
#website-description
{
-color: #04025C;
-font: bold 15px/16px georgia, garamond, serif;
-margin: 75px 0 0 0;
-padding: 0;
-text-align: left;
-float: right;
+ color: #04025C;
+ font: bold 15px/16px georgia, garamond, serif;
+ margin: 75px 0 0 0;
+ padding: 0;
+ text-align: left;
+ float: right;
}
#logo a:hover, #logo a:link, #logo a:visited, #logo a:active
{
-border: 0;
-color: #ffffff;
-background-color: transparent;
-text-decoration: none;
-padding: 0;
-margin: 0;
+ border: 0;
+ color: #ffffff;
+ background-color: transparent;
+ text-decoration: none;
+ padding: 0;
+ margin: 0;
}
#logo img
{
-margin: 0 0 0 20px;
+ margin: 0 0 0 20px;
}
/*********************************************************
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
