[Feed-collector-svn] SF.net SVN: feed-collector: [98] trunk
Status: Beta
Brought to you by:
c167
Menu
▾
▴
[Feed-collector-svn] SF.net SVN: feed-collector: [98] trunk
|
From: <c1...@us...> - 2007-01-09 21:45:27
|
Revision: 98
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=98&view=rev
Author: c167
Date: 2007-01-09 13:45:26 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/class/Feed_manager.php
trunk/inc/config.php
trunk/inc/navigation.php
trunk/page_add_tag.php
trunk/page_login.php
trunk/page_show_all_feeds.php
trunk/page_show_feed.php
trunk/page_show_feed_tag.php
trunk/styles/default/page_add_new_feed-screen.css
trunk/styles/default/page_add_new_feed.tpl
trunk/styles/default/page_add_tag-screen.css
trunk/styles/default/page_add_tag.tpl
trunk/styles/default/page_login-screen.css
trunk/styles/default/page_login.tpl
trunk/styles/default/page_main-screen.css
trunk/styles/default/page_main.tpl
trunk/styles/default/page_personal-screen.css
trunk/styles/default/page_personal.tpl
trunk/styles/default/page_register-screen.css
trunk/styles/default/page_register.tpl
trunk/styles/default/page_show_all_feeds-screen.css
trunk/styles/default/page_show_all_feeds.tpl
trunk/styles/default/page_show_feed-screen.css
trunk/styles/default/page_show_feed.tpl
trunk/styles/default/page_show_feed_tag-screen.css
trunk/styles/default/page_show_feed_tag.tpl
Added Paths:
-----------
trunk/i18n/de_DE/LC_MESSAGES/navigation.mo
trunk/i18n/de_DE/LC_MESSAGES/navigation.po
trunk/styles/default/common-screen.css
trunk/styles/default/footer-screen.css
trunk/styles/default/header-screen.css
trunk/styles/default/main_copy-screen.css
Modified: trunk/class/Feed_manager.php
===================================================================
--- trunk/class/Feed_manager.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/class/Feed_manager.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -217,12 +217,15 @@
public function getSpecFeeds($feed) {
$i = 0;
foreach ($feed as $oneFeed) {
- $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds WHERE feed_db_name = '$oneFeed';");
+ $query = $this->mdb->query("SELECT id, site_name, site_url, site_lang, feed_name, feed_db_name, feed_lang FROM feeds WHERE feed_db_name = '$oneFeed';");
if (PEAR :: isError($query)) {
continue;
}
$row = $query->fetchRow();
$return[$i]['id'] = $row['id'];
+ $return[$i]['site_name'] = $row['site_name'];
+ $return[$i]['site_url'] = $row['site_url'];
+ $return[$i]['site_lang'] = $row['site_lang'];
$return[$i]['feed_name'] = $row['feed_name'];
$return[$i]['feed_url'] = $row['feed_db_name'];
$return[$i]['feed_lang'] = $row['feed_lang'];
Added: trunk/i18n/de_DE/LC_MESSAGES/navigation.mo
===================================================================
(Binary files differ)
Property changes on: trunk/i18n/de_DE/LC_MESSAGES/navigation.mo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/i18n/de_DE/LC_MESSAGES/navigation.po
===================================================================
--- trunk/i18n/de_DE/LC_MESSAGES/navigation.po (rev 0)
+++ trunk/i18n/de_DE/LC_MESSAGES/navigation.po 2007-01-09 21:45:26 UTC (rev 98)
@@ -0,0 +1,58 @@
+# translation of navigation.po to Deutsch
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# C167 <c1...@us...>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: navigation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-08 22:46+0100\n"
+"PO-Revision-Date: 2007-01-08 22:50+0100\n"
+"Last-Translator: C167 <c1...@us...>\n"
+"Language-Team: Deutsch <i1...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: navigation.php:60
+msgid "Home"
+msgstr "Home"
+
+#: navigation.php:60
+msgid "Show all Feeds"
+msgstr "Alle Feeds"
+
+#: navigation.php:60
+msgid "Feeds by TAG"
+msgstr "Feeds nach TAG"
+
+#: navigation.php:60
+msgid "Add a Feed"
+msgstr "Feed hinzufügen"
+
+#: navigation.php:60
+msgid "Display a Feed"
+msgstr "Feed anzeigen"
+
+#: navigation.php:60
+msgid "Add a Tag"
+msgstr "Tag hinzufügen"
+
+#: navigation.php:63
+msgid "Login"
+msgstr "Anmelden"
+
+#: navigation.php:63
+msgid "Register"
+msgstr "Registrieren"
+
+#: navigation.php:66
+msgid "Personal Page"
+msgstr "Persönliche Seite"
+
+#: navigation.php:66
+msgid "LogOut"
+msgstr "Abmelden"
+
Modified: trunk/inc/config.php
===================================================================
--- trunk/inc/config.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/inc/config.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -1,4 +1,5 @@
<?php
+
/*
* This is the main configuration-file
* It will store the basic information
@@ -10,33 +11,39 @@
* CONFIGURATION
* You may change the values in this section to your needs
*/
-
+
// Database-configuration
-$db['type'] = "mysql"; // SQL_DB-Type
-$db['host'] = "localhost"; // The hostname
-$db['port'] = ""; // The Port. Nomally, the default port is right.
-$db['user'] = "feed-collector"; // The User that has access to the DB
-$db['passwd'] = "feed-collector"; // The password of this user
+$db['type'] = "mysql"; // SQL_DB-Type
+$db['host'] = "localhost"; // The hostname
+$db['port'] = ""; // The Port. Nomally, the default port is right.
+$db['user'] = "feed-collector"; // The User that has access to the DB
+$db['passwd'] = "feed-collector"; // The password of this user
$db['database'] = "feed-collector"; // The name of the database
-
// Session-configuration
-$session['time']['expire'] = 60*60*24;
-$session['time']['idle'] = 60*60;
+$session['time']['expire'] = 60 * 60 * 24;
+$session['time']['idle'] = 60 * 60;
$session['container']['tablename'] = "sessiondata";
$session['container']['autooptimisation_allowed'] = true;
// Update-configuration
-$update['enabled'] = true;
+$update['enabled'] = true;
$update['difference'] = 1800;
-$update['loglevel'] = PEAR_LOG_NOTICE;
+$update['loglevel'] = PEAR_LOG_NOTICE;
// Valid pages
-$validPages[] = "page_main.php";
-$validPages[] = "page_register";
-$validPages[] = "page_login.php";
-$validPages[] = "page_show_feeds.php";
-$validPages[] = "page_faq.php";
+$validPages = array (
+ "page_add_new_feed.php",
+ "page_add_tag.php",
+ "page_login.php",
+ "page_logout",
+ "page_main.php",
+ "page_personal.php",
+ "page_register",
+ "page_show_all_feeds.php",
+ "page_show_feed_tag.php",
+ "page_show_feedphp"
+);
// Languages
$langs[] = "de_DE";
@@ -48,16 +55,17 @@
*/
// Database-configuration
-$db['dsn'] = $db['type'] ."://" .$db['user'] .":" .$db['passwd'] ."@" .$db['host'] ."/" .$db['database'];
+$db['dsn'] = $db['type'] . "://" . $db['user'] . ":" . $db['passwd'] . "@" . $db['host'] . "/" . $db['database'];
// Session-configuration
-if(($db['type'] == "mysql" or $db['type'] == "postgresql") and $session['container']['autooptimisation_allowed']) {
+if (($db['type'] == "mysql" or $db['type'] == "postgresql") and $session['container']['autooptimisation_allowed']) {
$session['container']['autooptimize'] = true;
} else {
$session['container']['autooptimize'] = false;
}
-$session['container']['options'] = array('dsn' => $db['dsn'],
- 'table' => $session['container']['tablename'],
- 'autooptimize' => $session['container']['autooptimize']
- );
+$session['container']['options'] = array (
+ 'dsn' => $db['dsn'],
+ 'table' => $session['container']['tablename'],
+ 'autooptimize' => $session['container']['autooptimize']
+);
?>
\ No newline at end of file
Modified: trunk/inc/navigation.php
===================================================================
--- trunk/inc/navigation.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/inc/navigation.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -57,7 +57,7 @@
" <a href=\"./page_show_feed_tag.php\"$show_feed_tag>%s</a> |\n" .
" <a href=\"./page_add_new_feed.php\"$add_new_feed>%s</a> |\n" .
" <a href=\"./page_show_feed.php\"$show_feed>%s</a> |\n" .
-" <a href=\"./page_add_tag.php\"$add_tag>%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Display a Feed"), _("Add a Tag"));
+" <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Display a Feed"), !empty($_GET['feed']) ? "feed=" .$_GET['feed'] : "", _("Add a Tag"));
if (false === HTTP_Session :: get("logged_in", false)) {
$navigation .= sprintf(" <a href=\"./page_login.php\"$login>%s</a> |\n" .
" <a href=\"./page_register.php\"$register>%s</a>", _("Login"), _("Register"));
Modified: trunk/page_add_tag.php
===================================================================
--- trunk/page_add_tag.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/page_add_tag.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -11,7 +11,7 @@
*/
require_once "inc/config.php";
-//error_reporting(E_ALL);
+error_reporting(E_ALL);
############
# DATABASE #
############
@@ -76,7 +76,7 @@
$user = new User_manager($db);
if (false === HTTP_Session :: get("logged_in", false)) {
- //HTTP :: redirect("./page_login.php");
+ HTTP :: redirect("./page_login.php");
}
$page = "add_tag";
@@ -102,10 +102,11 @@
textdomain("page_$page");
$main = "";
-
+if (isset ($_POST['tag'])) {
+ $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']);
+}
if (!$tag_manager->hasTags($_GET['feed'])) {
- $main .= sprintf("");
- // there are no tags yet, please add one...
+ $main .= sprintf(" <p>%s</p\n", _("There are no tags yet!"));
} else {
$main .= sprintf(" <div id=\"tags\">\n" .
" <div id=\"tags_title\">%s</div>\n", _("Tags"));
@@ -123,9 +124,6 @@
}
$main .= " </div>\n";
}
-if (isset ($_POST['tag'])) {
- $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']);
-}
$main .= displayAddForm();
#####################
Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/page_login.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -210,22 +210,24 @@
$form = sprintf(" <div id=\"registration_form\">\n" .
" <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" .
"$message" .
- " <div id=\"formtitle\">%s</div>\n" .
- " <div class=\"left\">\n" .
- " <div class=\"formElem_$id_username\" >%s</div>\n" .
- " <div class=\"formElem_$id_password\" >%s</div>\n" .
- " </div>\n" .
- " <div class=\"right\">\n" .
- " <div class=\"formField_$id_username\" ><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></div>\n" .
- " <div class=\"formField_$id_password\" ><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></div>\n" .
- " </div>\n" .
- " <div id=\"formButtons\">\n" .
- " <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" .
- " <input type=\"reset\" value=\"%s\" />\n" .
- " </div>\n" .
+ " <table summary=\"\">\n" .
+ " <tr id=\"formtitle\">\n" .
+ " <th colspan=\"2\">%s</th>\n" .
+ " </tr>\n" .
+ " <tr>\n" .
+ " <td class=\"left_side\" class=\"formElem_$id_username\">%s</td>\n" .
+ " <td class=\"right_side\" class=\"formField_$id_username\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " </tr>\n" .
+ " <tr>\n" .
+ " <td class=\"left_side\" class=\"formElem_$id_password\">%s</td>\n" .
+ " <td class=\"right_side\" class=\"formField_$id_password\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
+ " </tr>\n" .
+ " <tr id=\"formButtons\">\n" .
+ " <td colspan=\"2\"><input type=\"submit\" value=\"%s\" name=\"submit\" /><input type=\"reset\" value=\"%s\" /></td>\n" .
+ " </tr>\n" .
+ " </table>\n" .
" </form>\n" .
- " <p id=\"required\">%s</p>\n" .
- " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), _("All fields are required"));
+ " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"));
return $form;
}
Modified: trunk/page_show_all_feeds.php
===================================================================
--- trunk/page_show_all_feeds.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/page_show_all_feeds.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -200,15 +200,15 @@
if (count($tags) == 1) {
$return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]);
} else {
- $return .= " <td>";
+ $return .= " <td>\n";
foreach ($tags as $id => $tag) {
$taglink = str_replace(" ", "%20", $tag);
- $return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>";
+ $return .= " <a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>\n";
if ($id !== (count($tags) - 1)) {
$return .= ", ";
}
}
- $return .= "</td>\n";
+ $return .= " </td>\n";
}
}
$return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" .
@@ -243,17 +243,17 @@
} else {
$tags = $tag_manager->getTags($list['feed_url']);
if (count($tags) == 1) {
- $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]);
+ $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]);
} else {
- $return .= " <td>\n";
+ $return .= " <td>\n";
foreach ($tags as $id => $tag) {
$taglink = str_replace(" ", "%20", $tag);
- $return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>";
+ $return .= " <a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>";
if ($id !== (count($tags) - 1)) {
- $return .= ", ";
+ $return .= ", \n";
}
}
- $return .= " </td>\n";
+ $return .= "\n </td>\n";
}
}
$return .= sprintf(" <td><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" .
Modified: trunk/page_show_feed.php
===================================================================
--- trunk/page_show_feed.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/page_show_feed.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -11,7 +11,7 @@
*/
require_once "inc/config.php";
-//error_reporting(E_ALL);
+error_reporting(E_ALL);
############
# DATABASE #
############
@@ -157,9 +157,13 @@
if (false == $tags) {
$rightSideBar .= sprintf("%s <a href=\"./page_add_tag.php?feed=%s\">%s</a>", _("No tag submitted yet, you can add one "), $_GET['feed'], _("here!"));
} else {
- foreach ($tags as $tag) {
- $rightSideBar .= sprintf(" <a href=\"./page_show_feed_tag.php?tag=%s\">%s</a>, \n", $tag, $tag);
- }
+ foreach ($tags as $id => $tag) {
+ $rightSideBar .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>";
+ if ($id !== (count($tags) - 1)) {
+ $rightSideBar .= ", ";
+ }
+ $rightSideBar .= "\n";
+ }
}
$rightSideBar .= "\n </div>";
$design = str_replace("<!-- rightSideBar -->", $rightSideBar, $design);
Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/page_show_feed_tag.php 2007-01-09 21:45:26 UTC (rev 98)
@@ -3,9 +3,7 @@
/**
* Created on 30.08.2006
- * This file is called if someone wants the main page or doesn't select any page
- * @version 1
- * @since 46 - 19.10.2006
+ *
* @author c167 <c1...@us...>
* @package feed-collector
*/
@@ -31,7 +29,9 @@
$db = & MDB2 :: factory($dsn, $options);
if (PEAR :: isError($db)) {
echo $db->getMessage();
- echo "<br />";
+ echo "<br />";if (isset ($_POST['tag'])) {
+ $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']);
+}
echo $db->getDebugInfo();
}
$db->setFetchMode(MDB2_FETCHMODE_ASSOC);
@@ -103,7 +103,8 @@
$main = sprintf(" <p class=\"space\">%s<br /><br /><br /><br /></p>", _("You did not select a tag, please select one on the input-field on the right side of the site... -->"));
} else {
$form = displaySearchForm();
- $main = createFeedsTable($_GET['tag'], $tag_manager, $feed);
+ //$main = createFeedsTable($_GET['tag'], $tag_manager, $feed);
+ $main = createSelectionTable($_GET['tag'], $tag_manager, $feed);
}
$design = file_get_contents("styles/default/page_show_feed_tag.tpl", "r");
@@ -153,45 +154,50 @@
echo $design;
-function createFeedsTable($tag, $tag_manager, $feed_manager) {
+function createSelectionTable($tag, $tag_manager, $feed_manager) {
$feeds = $tag_manager->getFeedsByTag($tag);
if (false === $feeds) {
return "error!!!";
}
- //$return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']);
- $return = sprintf(" <table summary=\"%s\">\n" .
- " <tr>\n" .
- " <th class=\"tagname\">%s</th>\n" .
- " </tr>\n" .
- " <tr>\n" .
- " <th>%s</th>\n" .
- " <th><img src=\"./pic/lang/International.gif\" alt=\"%s\" /></th>\n" .
- " </tr>\n", $_GET['tag'], $tag, _("Feed"), _("Language"));
- $feeds = $feed_manager->getSpecFeeds($feeds);
- for ($i = 0; $i < count($feeds); $i++) {
- $return .= sprintf(" <tr>\n" .
- " <td><a id=\"n%d\" href=\"./page_show_feed.php?feed=%s\">%s</a></td>\n" .
- " <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" .
- " </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']);
+ $return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']);
+ $return .= sprintf(" <table summary=\"\">\n" .
+ " <tr>\n" .
+ " <th>%s</th>\n" .
+ " <th>%s</th>\n" .
+ " <th>%s</th>\n" .
+ " <th class=\"language_flag\"><img src=\"pic/lang/International.gif\" alt=\"%s\" /></th>\n" .
+ " </tr>\n", _("Feed List"), _("Site"), _("Feed"), _("Tags"), _("Languages"));
+ $items = $feed_manager->getSpecFeeds($feeds);
+ foreach ($items as $list) {
+ $return .= sprintf(" <tr>\n" .
+ " <td><a href=\"./page_show_feed?feed=%s\">%s</a></td>\n" .
+ " <td><a href=\"%s\">%s</a></td>\n", $list['feed_url'], $list['feed_name'], $list['site_url'], $list['site_name']);
+ if (false === $tag_manager->hasTags($list['feed_url'])) {
+ $return .= " <td> </td>\n";
+ } else {
+ $tags = $tag_manager->getTags($list['feed_url']);
+ if (count($tags) == 1) {
+ $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]);
+ } else {
+ $return .= " <td>\n";
+ foreach ($tags as $id => $tag) {
+ $taglink = str_replace(" ", "%20", $tag);
+ $return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>";
+ if ($id !== (count($tags) - 1)) {
+ $return .= ", ";
+ }
+ }
+ $return .= " </td>\n";
+ }
+ }
+ $return .= sprintf(" <td class=\"right_side\"><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" .
+ " </tr>\n", $list['site_lang'], $list['site_lang']);
+ }
- }
- $return .= " </table>";
+ $return .= " </table>";
return $return;
}
-function findBiggestArray($a1, $a2, $a3) {
- $a1 = count($a1);
- $a2 = count($a2);
- $a3 = count($a3);
- $number = 0;
- if ($a1 > $number)
- $number = $a1;
- if ($a2 > $number)
- $number = $a2;
- if ($a3 > $number)
- $number = $a3;
- return $number;
-}
function displaySearchForm() {
Added: trunk/styles/default/common-screen.css
===================================================================
--- trunk/styles/default/common-screen.css (rev 0)
+++ trunk/styles/default/common-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -0,0 +1,159 @@
+/*****************************************
+ * TITLE: Common Screen Stylesheet *
+ * URI: styles/default/common-screen.css *
+ * MODIF: 2007-Jan-09 18:06 +0100 *
+ *****************************************/
+ @CHARSET "UTF-8";
+
+/* ##### Common Styles ##### */
+.headerLogin {
+ border: 1px solid rgb(255, 255, 255);
+ text-align: right;
+ padding: 1ex;
+ position: absolute;
+ right: 1.5em;
+ top: 3.5em;
+}
+
+.headerLogin {
+ border: 1px solid rgb(255, 255, 255);
+ text-align: right;
+ margin: 0;
+ /* padding: 0 0 2ex 0;*/
+ padding-bottom: 1ex;
+ position: absolute;
+ right: 1.5em;
+ top: 3.5em;
+ /* margin-left: 1em;
+ margin-right: 1em;*/
+}
+
+.headerLogin a {
+ color: white;
+ background-color: transparent;
+ text-decoration: none;
+ margin: 0;
+ padding: 0 0 0.5ex 0;
+ display: block;
+}
+
+.headerLogin span {
+
+}
+
+#userinfo p {
+ color: white;
+ background-color: transparent;
+ margin: 0;
+ display: block;
+}
+
+.headerLogin input:hover { /* color: rgb(195,196,210);*/
+ color: black;
+ /* background-color: transparent;*/
+ background-color: rgb(117, 144, 174);
+ text-decoration: underline;
+}
+
+.subHeader {
+ color: white;
+ background-color: rgb(117, 144, 174);
+ margin: 0;
+ padding: 0.5ex 10px;
+}
+
+.subHeader a,.subHeader .highlight {
+ color: white;
+ background-color: transparent;
+ font-size: 110%;
+ font-weight: bold;
+ text-decoration: none;
+ margin: 0;
+ padding: 0 0.25ex 0 0;
+}
+
+.subHeader a:hover,.subHeader .highlight {
+ color: rgb(255, 204, 0);
+ background-color: transparent;
+ text-decoration: none;
+}
+
+body {
+ font-family: verdana, helvetica, arial, sans-serif;
+ font-size: 73%; /* Enables font size scaling in MSIE */
+ margin: 0;
+ padding: 0;
+}
+
+html>body {
+ font-size: 9pt;
+}
+
+acronym,.titleTip {
+ border-bottom: 1px dotted rgb(61, 92, 122);
+ cursor: help;
+ margin: 0;
+ padding: 0 0 0.4px 0;
+}
+
+a {
+ color: rgb(61, 92, 122);
+ background-color: transparent;
+ text-decoration: underline;
+ margin: 0;
+ padding: 0 1px 2px 1px;
+}
+
+a:hover {
+ color: rgb(117, 144, 174);
+ text-decoration: none;
+}
+
+ol {
+ margin: 1em 0 1.5em 0;
+ padding: 0;
+}
+
+ul {
+ list-style-type: square;
+ margin: 1em 0 1.5em 0;
+ padding: 0;
+}
+
+dl {
+ margin: 1em 0 0.5em 0;
+ padding: 0;
+}
+
+ul li {
+ line-height: 1.5em;
+ margin: 1.25ex 0 0 1.5em;
+ padding: 0;
+}
+
+ol li {
+ line-height: 1.5em;
+ margin: 1.25ex 0 0 2em;
+ padding: 0;
+}
+
+dt {
+ font-weight: bold;
+ margin: 0;
+ padding: 0 0 1ex 0;
+}
+
+dd {
+ line-height: 1.75em;
+ margin: 0 0 1.5em 1.5em;
+ padding: 0;
+}
+
+.doNotDisplay {
+ display: none !important;
+}
+
+.smallCaps {
+ font-size: 117%;
+ font-variant: small-caps;
+}
\ No newline at end of file
Added: trunk/styles/default/footer-screen.css
===================================================================
--- trunk/styles/default/footer-screen.css (rev 0)
+++ trunk/styles/default/footer-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -0,0 +1,30 @@
+/*****************************************
+ * TITLE: Footer Screen Stylesheet *
+ * URI: styles/default/footer-screen.css *
+ * MODIF: 2007-Jan-09 18:06 +0100 *
+ *****************************************/
+ @CHARSET "UTF-8";
+
+
+/* ##### Footer ##### */
+
+#footer {
+ color: rgb(51,51,102);
+ background-color: rgb(239,239,239);
+ font-size: 87%;
+ text-align: center;
+ line-height: 1.25em;
+ margin: 2em 0 0 0;
+ padding: 1ex 10px;
+ clear: left;
+}
+
+#footer a {
+ color: rgb(0,68,204);
+ background-color: transparent;
+ text-decoration: underline;
+}
+
+#footer a:hover {
+ text-decoration: none;
+}
\ No newline at end of file
Added: trunk/styles/default/header-screen.css
===================================================================
--- trunk/styles/default/header-screen.css (rev 0)
+++ trunk/styles/default/header-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -0,0 +1,89 @@
+/*****************************************
+ * TITLE: Header Screen Stylesheet *
+ * URI: styles/default/header-screen.css *
+ * MODIF: 2007-Jan-09 18:06 +0100 *
+ *****************************************/
+ @CHARSET "UTF-8";
+
+/* ##### Header ##### */
+.superHeader {
+ color: rgb(130, 128, 154);
+ background-color: rgb(33, 50, 66);
+ text-align: right;
+ margin: 0;
+ padding: 0.5ex 10px;
+}
+
+.superHeader span {
+ color: rgb(195, 196, 210);
+ background-color: transparent;
+ font-weight: bold;
+ text-transform: uppercase;
+}
+
+.superHeader a {
+ color: rgb(195, 196, 210);
+ background-color: transparent;
+ text-decoration: none;
+ margin: 0;
+ padding: 0 0.25ex 0 0;
+}
+
+.superHeader a:hover {
+ color: rgb(193, 102, 90);
+ background-color: transparent;
+ text-decoration: none;
+}
+
+.midHeader {
+ color: white;
+ background-color: rgb(61, 92, 122);
+ margin: 0;
+ padding: 0.26ex 10px;
+}
+
+.headerTitle {
+ font-size: 300%;
+ margin: 0;
+ padding: 0;
+}
+
+.headerSubTitle {
+ font-size: 151%;
+ font-weight: normal;
+ font-style: italic;
+ margin: 0 0 1ex 0;
+ padding: 0;
+}
+
+.headerLogin {
+ border: 1px solid rgb(255, 255, 255);
+ text-align: right;
+ padding: 1ex;
+ position: absolute;
+ right: 1.5em;
+ top: 3.5em;
+}
+
+.subHeader {
+ color: white;
+ background-color: rgb(117, 144, 174);
+ margin: 0;
+ padding: 0.5ex 10px;
+}
+
+.subHeader a,.subHeader .highlight {
+ color: white;
+ background-color: transparent;
+ font-size: 110%;
+ font-weight: bold;
+ text-decoration: none;
+ margin: 0;
+ padding: 0 0.25ex 0 0;
+}
+
+.subHeader a:hover,.subHeader .highlight {
+ color: rgb(255, 204, 0);
+ background-color: transparent;
+ text-decoration: none;
+}
\ No newline at end of file
Added: trunk/styles/default/main_copy-screen.css
===================================================================
--- trunk/styles/default/main_copy-screen.css (rev 0)
+++ trunk/styles/default/main_copy-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -0,0 +1,52 @@
+/********************************************
+ * TITLE: Main Copy Screen Stylesheet *
+ * URI: styles/default/main_copy-screen.css *
+ * MODIF: 2007-Jan-09 18:06 +0100 *
+ ********************************************/
+ @CHARSET "UTF-8";
+
+/* ##### Main Copy ##### */
+
+#main-copy {
+ margin: 0;
+ padding: 0.5em 10px;
+ clear: left;
+}
+
+#main-copy h1 {
+ color: rgb(117,144,174);
+ background-color: transparent;
+ font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
+ font-size: 200%;
+ margin: 0;
+ padding: 0;
+}
+
+#main-copy h2 {
+ color: rgb(61,92,122);
+ background-color: transparent;
+ font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
+ font-weight: normal;
+ font-size: 151%;
+ margin: 0;
+ padding: 1ex 0 0 0;
+}
+
+#main-copy p {
+ line-height: 1.75em;
+ margin: 1em 0 1.5em 0;
+ padding: 0;
+}
+
+/* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
+ * that don't require the creation of new classes - but which are not
+ * supported by MSIE - are the following:
+ *
+ * .rowOfBoxes > div:first-child {
+ * border-left: none;
+ * }
+ *
+ * .rowOfBoxes + .rowOfBoxes {
+ * border-top: 1px solid rgb(204,204,204);
+ * }
+ */
\ No newline at end of file
Modified: trunk/styles/default/page_add_new_feed-screen.css
===================================================================
--- trunk/styles/default/page_add_new_feed-screen.css 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_add_new_feed-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -1,221 +1,10 @@
/******************************************************
- * TITLE: Show Feeds Screen Stylesheet *
+ * TITLE: Add New Feed Screen Stylesheet *
* URI: styles/default/page_add_new_feed-screen.css *
* MODIF: 2006-Nov-16 18:06 +0100 *
******************************************************/
- /* ##### Common Styles ##### */
-body {
- font-family: verdana, helvetica, arial, sans-serif;
- font-size: 73%; /* Enables font size scaling in MSIE */
- margin: 0;
- padding: 0;
-}
-
-html>body {
- font-size: 9pt;
-}
-
-acronym,.titleTip {echo 4;
- border-bottom: 1px dotted rgb(61, 92, 122);
- cursor: help;
- margin: 0;
- padding: 0 0 0.4px 0;
-}
-
-a {
- color: rgb(61, 92, 122);
- background-color: transparent;
- text-decoration: underline;
- margin: 0;
- padding: 0 1px 2px 1px;
-}
-
-a:hover {
- color: rgb(117, 144, 174);
- text-decoration: none;
-}
-
-ol {
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-ul {
- list-style-type: square;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-dl {
- margin: 1em 0 0.5em 0;
- padding: 0;
-}
-
-ul li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 1.5em;
- padding: 0;
-}
-
-ol li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 2em;
- padding: 0;
-}
-
-dt {
- font-weight: bold;
- margin: 0;
- padding: 0 0 1ex 0;
-}
-
-dd {
- line-height: 1.75em;
- margin: 0 0 1.5em 1.5em;
- padding: 0;
-}
-
-.doNotDisplay {
- display: none !important;
-}
-
-.smallCaps {
- font-size: 117%;
- font-variant: small-caps;
-}
-
-/* ##### Header ##### */
-.superHeader {
- color: rgb(130, 128, 154);
- background-color: rgb(33, 50, 66);
- text-align: right;
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.superHeader span {
- color: rgb(195, 196, 210);
- background-color: transparent;
- font-weight: bold;
- text-transform: uppercase;
-}
-
-.superHeader a {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.superHeader a:hover {
- color: rgb(193, 102, 90);
- background-color: transparent;
- text-decoration: none;
-}
-
-.midHeader {
- color: white;
- background-color: rgb(61, 92, 122);
- margin: 0;
- padding: 0.26ex 10px;
-}
-
-.headerTitle {
- font-size: 300%;
- margin: 0;
- padding: 0;
-}
-
-.headerSubTitle {
- font-size: 151%;
- font-weight: normal;
- font-style: italic;
- margin: 0 0 1ex 0;
- padding: 0;
-}
-
-.headerLogin {
- border: 1px solid rgb(255,255,255);
- text-align: right;
- padding: 1ex;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-
-.headerLinks a {
- color: white;
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0 0.5ex 0;
- display: block;
-}
-
-.headerLinks a:hover {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: underline;
-}
-
-.subHeader {
- color: white;
- background-color: rgb(117, 144, 174);
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.subHeader a,.subHeader .highlight {
- color: white;
- background-color: transparent;
- font-size: 110%;
- font-weight: bold;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.subHeader a:hover,.subHeader .highlight {
- color: rgb(255, 204, 0);
- background-color: transparent;
- text-decoration: none;
-}
-
-/* ##### Main Copy ##### */
-#main-copy {
- margin: 0;
- padding: 0.5em 10px;
- clear: left;
-}
-
-#main-copy h1 {
- color: rgb(117, 144, 174);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-size: 200%;
- margin: 0;
- padding: 0;
-}
-
-#main-copy h2 {
- color: rgb(61, 92, 122);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-weight: normal;
- font-size: 151%;
- margin: 0;
- padding: 1ex 0 0 0;
-}
-
-#main-copy p {
- line-height: 1.75em;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-#add_form {
- /*margin: 1em 0;*/
+ /* ##### Main Copy ##### */
+#add_form { /*margin: 1em 0;*/
margin-top: 1em;
margin-left: 10%;
margin-right: 10%;
@@ -239,16 +28,10 @@
}
.required .formElem {
-/* border-top: 1px dashed red;
- border-left: 1px dashed red;
- border-bottom: 1px dashed red;*/
background-color: rgb(204, 204, 204);
}
.required .formField {
- /*border-top: 1px dashed red;
- border-right: 1px dashed red;
- border-bottom: 1px dashed red;*/
background-color: rgb(204, 204, 204);
}
@@ -276,85 +59,4 @@
margin-top: 16em;
padding: 1ex 10px;
border-top: 1px solid rgb(204, 204, 204);
-}
-
-.quarter,.oneThird,.half,.twoThirds,.fullWidth {
- /*margin: 1em 0;*/
- float: left;
- border-left: 1px solid rgb(204, 204, 204);
-}
-
-.quarter {
- width: 21%;
- padding: 0 1.9%;
-}
-
-.oneThird {
- width: 28%;
- padding: 0 1.9%;
-}
-
-.half {
- text-align: justify;
- width: 46%;
- padding: 0 1.9%;
-}
-
-.twoThirds {
- text-align: justify;
- width: 63%;
- padding: 0 1.9%;
-}
-
-.fullWidth {
- text-align: justify;
- width: 96%;
- padding: 0 1.2em;
- border-left: none;
-}
-
-.filler {
- /* use with an empty <p> element to add padding to the end of a text box */
- border: 1px solid white;
-}
-
-.noBorderOnLeft {
- border-left: none;
-}
-
-.dividingBorderAbove {
- border-top: 1px solid rgb(204, 204, 204);
-}
-
-/* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
- * that don't require the creation of new classes - but which are not
- * supported by MSIE - are the following:
- *
- * .rowOfBoxes > div:first-child {
- * border-left: none;
- * }
- *
- * .rowOfBoxes + .rowOfBoxes {
- * border-top: 1px solid rgb(204,204,204);
- * }
- */ /* ##### Footer ##### */
-#footer {
- color: rgb(51, 51, 102);
- background-color: rgb(239, 239, 239);
- font-size: 87%;
- text-align: center;
- line-height: 1.25em;
- margin: 2em 0 0 0;
- padding: 1ex 10px;
- clear: left;
-}
-
-#footer a {
- color: rgb(0, 68, 204);
- background-color: transparent;
- text-decoration: underline;
-}
-
-#footer a:hover {
- text-decoration: none;
}
\ No newline at end of file
Modified: trunk/styles/default/page_add_new_feed.tpl
===================================================================
--- trunk/styles/default/page_add_new_feed.tpl 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_add_new_feed.tpl 2007-01-09 21:45:26 UTC (rev 98)
@@ -8,6 +8,10 @@
<meta name="generator" content="haran" />
<link rel="stylesheet" type="text/css" href="./styles/default/page_add_new_feed-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" />
<title><!-- title --></title>
</head>
Modified: trunk/styles/default/page_add_tag-screen.css
===================================================================
--- trunk/styles/default/page_add_tag-screen.css 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_add_tag-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -1,228 +1,12 @@
/**************************************************
- * TITLE: Show Feeds Screen Stylesheet *
+ * TITLE: Add Tag Screen Stylesheet *
* URI: styles/default/page_login-screen.css *
* MODIF: 2006-Nov-16 18:06 +0100 *
**************************************************/
- /* ##### Common Styles ##### */
-body {
- font-family: verdana, helvetica, arial, sans-serif;
- font-size: 73%; /* Enables font size scaling in MSIE */
- margin: 0;
- padding: 0;
-}
-html>body {
- font-size: 9pt;
-}
-acronym,.titleTip {
- border-bottom: 1px dotted rgb(61, 92, 122);
- cursor: help;
- margin: 0;
- padding: 0 0 0.4px 0;
-}
-
-a {
- color: rgb(61, 92, 122);
- background-color: transparent;
- text-decoration: underline;
- margin: 0;
- padding: 0 1px 2px 1px;
-}
-
-a:hover {
- color: rgb(117, 144, 174);
- text-decoration: none;
-}
-
-ol {
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-ul {
- list-style-type: square;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-dl {
- margin: 1em 0 0.5em 0;
- padding: 0;
-}
-
-ul li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 1.5em;
- padding: 0;
-}
-
-ol li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 2em;
- padding: 0;
-}
-
-dt {
- font-weight: bold;
- margin: 0;
- padding: 0 0 1ex 0;
-}
-
-dd {
- line-height: 1.75em;
- margin: 0 0 1.5em 1.5em;
- padding: 0;
-}
-
-.doNotDisplay {
- display: none !important;
-}
-
-.smallCaps {
- font-size: 117%;
- font-variant: small-caps;
-}
-
-/* ##### Header ##### */
-.superHeader {
- color: rgb(130, 128, 154);
- background-color: rgb(33, 50, 66);
- text-align: right;
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.superHeader span {
- color: rgb(195, 196, 210);
- background-color: transparent;
- font-weight: bold;
- text-transform: uppercase;
-}
-
-.superHeader a {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.superHeader a:hover {
- color: rgb(193, 102, 90);
- background-color: transparent;
- text-decoration: none;
-}
-
-.midHeader {
- color: white;
- background-color: rgb(61, 92, 122);
- margin: 0;
- padding: 0.26ex 10px;
-}
-
-.headerTitle {
- font-size: 300%;
- margin: 0;
- padding: 0;
-}
-
-.headerSubTitle {
- font-size: 151%;
- font-weight: normal;
- font-style: italic;
- margin: 0 0 1ex 0;
- padding: 0;
-}
-
-.headerLogin {
- border: 1px solid rgb(255,255,255);
- text-align: right;
- padding: 1ex;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-
-.headerLinks {
- text-align: right;
- margin: 0;
- padding: 0 0 2ex 0;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-
-.headerLinks a {
- color: white;
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0 0.5ex 0;
- display: block;
-}
-
-.headerLinks a:hover {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: underline;
-}
-
-.subHeader {
- color: white;
- background-color: rgb(117, 144, 174);
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.subHeader a,.subHeader .highlight {
- color: white;
- background-color: transparent;
- font-size: 110%;
- font-weight: bold;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.subHeader a:hover,.subHeader .highlight {
- color: rgb(255, 204, 0);
- background-color: transparent;
- text-decoration: none;
-}
-
/* ##### Main Copy ##### */
-#main-copy {
- margin: 0;
- padding: 0.5em 10px;
- clear: left;
-}
-#main-copy h1 {
- color: rgb(117, 144, 174);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-size: 200%;
- margin: 0;
- padding: 0;
-}
-
-#main-copy h2 {
- color: rgb(61, 92, 122);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-weight: normal;
- font-size: 151%;
- margin: 0;
- padding: 1ex 0 0 0;
-}
-
-#main-copy p {
- line-height: 1.75em;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
#formtitle {
text-align: center;
color: white;
@@ -261,45 +45,4 @@
.filler {
/* use with an empty <p> element to add padding to the end of a text box */
border: 1px solid white;
-}
-
-.noBorderOnLeft {
- border-left: none;
-}
-
-.dividingBorderAbove {
- border-top: 1px solid rgb(204, 204, 204);
-}
-
-/* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
- * that don't require the creation of new classes - but which are not
- * supported by MSIE - are the following:
- *
- * .rowOfBoxes > div:first-child {
- * border-left: none;
- * }
- *
- * .rowOfBoxes + .rowOfBoxes {
- * border-top: 1px solid rgb(204,204,204);
- * }
- */ /* ##### Footer ##### */
-#footer {
- color: rgb(51, 51, 102);
- background-color: rgb(239, 239, 239);
- font-size: 87%;
- text-align: center;
- line-height: 1.25em;
- margin: 2em 0 0 0;
- padding: 1ex 10px;
- clear: left;
-}
-
-#footer a {
- color: rgb(0, 68, 204);
- background-color: transparent;
- text-decoration: underline;
-}
-
-#footer a:hover {
- text-decoration: none;
}
\ No newline at end of file
Modified: trunk/styles/default/page_add_tag.tpl
===================================================================
--- trunk/styles/default/page_add_tag.tpl 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_add_tag.tpl 2007-01-09 21:45:26 UTC (rev 98)
@@ -8,6 +8,10 @@
<meta name="generator" content="haran" />
<link rel="stylesheet" type="text/css" href="./styles/default/page_add_tag-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" />
<title><!-- title --></title>
</head>
Modified: trunk/styles/default/page_login-screen.css
===================================================================
--- trunk/styles/default/page_login-screen.css 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_login-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -1,219 +1,12 @@
/**************************************************
- * TITLE: Show Feeds Screen Stylesheet *
+ * TITLE: Login Screen Stylesheet *
* URI: styles/default/page_login-screen.css *
* MODIF: 2006-Nov-16 18:06 +0100 *
**************************************************/
- /* ##### Common Styles ##### */
-body {
- font-family: verdana, helvetica, arial, sans-serif;
- font-size: 73%; /* Enables font size scaling in MSIE */
- margin: 0;
- padding: 0;
-}
-html>body {
- font-size: 9pt;
-}
-acronym,.titleTip {
- border-bottom: 1px dotted rgb(61, 92, 122);
- cursor: help;
- margin: 0;
- padding: 0 0 0.4px 0;
-}
-
-a {
- color: rgb(61, 92, 122);
- background-color: transparent;
- text-decoration: underline;
- margin: 0;
- padding: 0 1px 2px 1px;
-}
-
-a:hover {
- color: rgb(117, 144, 174);
- text-decoration: none;
-}
-
-ol {
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-ul {
- list-style-type: square;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-dl {
- margin: 1em 0 0.5em 0;
- padding: 0;
-}
-
-ul li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 1.5em;
- padding: 0;
-}
-
-ol li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 2em;
- padding: 0;
-}
-
-dt {
- font-weight: bold;
- margin: 0;
- padding: 0 0 1ex 0;
-}
-
-dd {
- line-height: 1.75em;
- margin: 0 0 1.5em 1.5em;
- padding: 0;
-}
-
-.doNotDisplay {
- display: none !important;
-}
-
-.smallCaps {
- font-size: 117%;
- font-variant: small-caps;
-}
-
-/* ##### Header ##### */
-.superHeader {
- color: rgb(130, 128, 154);
- background-color: rgb(33, 50, 66);
- text-align: right;
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.superHeader span {
- color: rgb(195, 196, 210);
- background-color: transparent;
- font-weight: bold;
- text-transform: uppercase;
-}
-
-.superHeader a {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.superHeader a:hover {
- color: rgb(193, 102, 90);
- background-color: transparent;
- text-decoration: none;
-}
-
-.midHeader {
- color: white;
- background-color: rgb(61, 92, 122);
- margin: 0;
- padding: 0.26ex 10px;
-}
-
-.headerTitle {
- font-size: 300%;
- margin: 0;
- padding: 0;
-}
-
-.headerSubTitle {
- font-size: 151%;
- font-weight: normal;
- font-style: italic;
- margin: 0 0 1ex 0;
- padding: 0;
-}
-
-.headerLogin {
- border: 1px solid rgb(255,255,255);
- text-align: right;
- padding: 1ex;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-
-.headerLinks a {
- color: white;
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0 0.5ex 0;
- display: block;
-}
-
-.headerLinks a:hover {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: underline;
-}
-
-.subHeader {
- color: white;
- background-color: rgb(117, 144, 174);
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.subHeader a,.subHeader .highlight {
- color: white;
- background-color: transparent;
- font-size: 110%;
- font-weight: bold;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.subHeader a:hover,.subHeader .highlight {
- color: rgb(255, 204, 0);
- background-color: transparent;
- text-decoration: none;
-}
-
/* ##### Main Copy ##### */
-#main-copy {
- margin: 0;
- padding: 0.5em 10px;
- clear: left;
-}
-#main-copy h1 {
- color: rgb(117, 144, 174);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-size: 200%;
- margin: 0;
- padding: 0;
-}
-
-#main-copy h2 {
- color: rgb(61, 92, 122);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-weight: normal;
- font-size: 151%;
- margin: 0;
- padding: 1ex 0 0 0;
-}
-
-#main-copy p {
- line-height: 1.75em;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
#registration_form table {
float: left;
border: 1px solid rgb(204, 204, 204);
@@ -283,79 +76,4 @@
margin: 1em 0;
float: left;
border-left: 1px solid rgb(204, 204, 204);
-}
-
-.quarter {
- width: 21%;
- padding: 0 1.9%;
-}
-
-.oneThird {
- width: 28%;
- padding: 0 1.9%;
-}
-
-.half {
- text-align: justify;
- width: 46%;
- padding: 0 1.9%;
-}
-
-.twoThirds {
- text-align: justify;
- width: 63%;
- padding: 0 1.9%;
-}
-
-.fullWidth {
- text-align: justify;
- width: 96%;
- padding: 0 1.2em;
- border-left: none;
-}
-
-.filler {
- /* use with an empty <p> element to add padding to the end of a text box */
- border: 1px solid white;
-}
-
-.noBorderOnLeft {
- border-left: none;
-}
-
-.dividingBorderAbove {
- border-top: 1px solid rgb(204, 204, 204);
-}
-
-/* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
- * that don't require the creation of new classes - but which are not
- * supported by MSIE - are the following:
- *
- * .rowOfBoxes > div:first-child {
- * border-left: none;
- * }
- *
- * .rowOfBoxes + .rowOfBoxes {
- * border-top: 1px solid rgb(204,204,204);
- * }
- */ /* ##### Footer ##### */
-#footer {
- color: rgb(51, 51, 102);
- background-color: rgb(239, 239, 239);
- font-size: 87%;
- text-align: center;
- line-height: 1.25em;
- margin: 2em 0 0 0;
- padding: 1ex 10px;
- clear: left;
-}
-
-#footer a {
- color: rgb(0, 68, 204);
- background-color: transparent;
- text-decoration: underline;
-}
-
-#footer a:hover {
- text-decoration: none;
}
\ No newline at end of file
Modified: trunk/styles/default/page_login.tpl
===================================================================
--- trunk/styles/default/page_login.tpl 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_login.tpl 2007-01-09 21:45:26 UTC (rev 98)
@@ -8,6 +8,10 @@
<meta name="generator" content="haran" />
<link rel="stylesheet" type="text/css" href="./styles/default/page_login-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" />
<title><!-- title --></title>
</head>
Modified: trunk/styles/default/page_main-screen.css
===================================================================
--- trunk/styles/default/page_main-screen.css 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_main-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -3,217 +3,10 @@
* URI : styles/default/page_main-screen.css *
* MODIF: 2006-Nov-11 23:09 +0100 *
**********************************************/
- /* ##### Common Styles ##### */
-body {
- font-family: verdana, helvetica, arial, sans-serif;
- font-size: 73%; /* Enables font size scaling in MSIE */
- margin: 0;
- padding: 0;
-}
-html>body {
- font-size: 9pt;
-}
-acronym,.titleTip {
- border-bottom: 1px dotted rgb(61, 92, 122);
- cursor: help;
- margin: 0;
- padding: 0 0 0.4px 0;
-}
-
-a {
- color: rgb(61, 92, 122);
- background-color: transparent;
- text-decoration: underline;
- margin: 0;
- padding: 0 1px 2px 1px;
-}
-
-a:hover {
- color: rgb(117, 144, 174);
- text-decoration: none;
-}
-
-ol {
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-ul {
- list-style-type: square;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-dl {
- margin: 1em 0 0.5em 0;
- padding: 0;
-}
-
-ul li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 1.5em;
- padding: 0;
-}
-
-ol li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 2em;
- padding: 0;
-}
-
-dt {
- font-weight: bold;
- margin: 0;
- padding: 0 0 1ex 0;
-}
-
-dd {
- line-height: 1.75em;
- margin: 0 0 1.5em 1.5em;
- padding: 0;
-}
-
-.doNotDisplay {
- display: none !important;
-}
-
-.smallCaps {
- font-size: 117%;
- font-variant: small-caps;
-}
-
-/* ##### Header ##### */
-.superHeader {
- color: rgb(130, 128, 154);
- background-color: rgb(33, 50, 66);
- text-align: right;
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.superHeader span {
- color: rgb(195, 196, 210);
- background-color: transparent;
- font-weight: bold;
- text-transform: uppercase;
-}
-
-.superHeader a {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.superHeader a:hover {
- color: rgb(193, 102, 90);
- background-color: transparent;
- text-decoration: none;
-}
-
-/*
-.subHeader .highlight {
- color: rgb(253,160,91);
- background-color: transparent;
-}
-*/
-.midHeader {
- color: white;
- background-color: rgb(61, 92, 122);
- margin: 0;
- padding: 0.26ex 10px;
-}
-
-.headerTitle {
- font-size: 300%;
- margin: 0;
- padding: 0;
-}
-
-.headerSubTitle {
- font-size: 151%;
- font-weight: normal;
- font-style: italic;
- margin: 0 0 1ex 0;
- padding: 0;
-}
-
-.headerLogin {
- border: 1px solid rgb(255,255,255);
- text-align: right;
- padding: 1ex;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-/*
-.headerLogin a {
- color: white;
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0 0.5ex 0;
- display: block;
-}
-*/
-.subHeader {
- color: white;
- background-color: rgb(117, 144, 174);
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.subHeader a,.subHeader .highlight {
- color: white;
- background-color: transparent;
- font-size: 110%;
- font-weight: bold;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.subHeader a:hover,.subHeader .highlight {
- color: rgb(255, 204, 0);
- background-color: transparent;
- text-decoration: none;
-}
-
/* ##### Main Copy ##### */
-#main-copy {
- margin: 0;
- padding: 0.5em 10px;
- clear: left;
-}
-#main-copy h1 {
- color: rgb(117, 144, 174);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-size: 200%;
- margin: 0;
- padding: 0;
-}
-
-#main-copy h2 {
- color: rgb(61, 92, 122);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-weight: normal;
- font-size: 151%;
- margin: 0;
- padding: 1ex 0 0 0;
-}
-
-#main-copy p {
- line-height: 1.75em;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
.newsHeading {
color: rgb(61, 92, 122);
background-color: transparent;
@@ -325,24 +118,4 @@
* .rowOfBoxes + .rowOfBoxes {
* border-top: 1px solid rgb(204,204,204);
* }
- */ /* ##### Footer ##### */
-#footer {
- color: rgb(51, 51, 102);
- background-color: rgb(239, 239, 239);
- font-size: 87%;
- text-align: center;
- line-height: 1.25em;
- margin: 2em 0 0 0;
- padding: 1ex 10px;
- clear: left;
-}
-
-#footer a {
- color: rgb(0, 68, 204);
- background-color: transparent;
- text-decoration: underline;
-}
-
-#footer a:hover {
- text-decoration: none;
-}
\ No newline at end of file
+ */
\ No newline at end of file
Modified: trunk/styles/default/page_main.tpl
===================================================================
--- trunk/styles/default/page_main.tpl 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_main.tpl 2007-01-09 21:45:26 UTC (rev 98)
@@ -8,6 +8,10 @@
<meta name="generator" content="haran" />
<link rel="stylesheet" type="text/css" href="./styles/default/page_main-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" />
<title><!-- title --></title>
</head>
Modified: trunk/styles/default/page_personal-screen.css
===================================================================
--- trunk/styles/default/page_personal-screen.css 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_personal-screen.css 2007-01-09 21:45:26 UTC (rev 98)
@@ -1,228 +1,12 @@
/**************************************************
- * TITLE: Show Feeds Screen Stylesheet *
+ * TITLE: Personal Screen Stylesheet *
* URI: styles/default/page_show_feeds-screen.css *
* MODIF: 2006-Nov-16 18:06 +0100 *
**************************************************/
- /* ##### Common Styles ##### */
-body {
- font-family: verdana, helvetica, arial, sans-serif;
- font-size: 73%; /* Enables font size scaling in MSIE */
- margin: 0;
- padding: 0;
-}
-html>body {
- font-size: 9pt;
-}
-acronym,.titleTip {
- border-bottom: 1px dotted rgb(61, 92, 122);
- cursor: help;
- margin: 0;
- padding: 0 0 0.4px 0;
-}
-
-a {
- color: rgb(61, 92, 122);
- background-color: transparent;
- text-decoration: underline;
- margin: 0;
- padding: 0 1px 2px 1px;
-}
-
-a:hover {
- color: rgb(117, 144, 174);
- text-decoration: none;
-}
-
-ol {
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-ul {
- list-style-type: square;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
-dl {
- margin: 1em 0 0.5em 0;
- padding: 0;
-}
-
-ul li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 1.5em;
- padding: 0;
-}
-
-ol li {
- line-height: 1.5em;
- margin: 1.25ex 0 0 2em;
- padding: 0;
-}
-
-dt {
- font-weight: bold;
- margin: 0;
- padding: 0 0 1ex 0;
-}
-
-dd {
- line-height: 1.75em;
- margin: 0 0 1.5em 1.5em;
- padding: 0;
-}
-
-.doNotDisplay {
- display: none !important;
-}
-
-.smallCaps {
- font-size: 117%;
- font-variant: small-caps;
-}
-
-/* ##### Header ##### */
-.superHeader {
- color: rgb(130, 128, 154);
- background-color: rgb(33, 50, 66);
- text-align: right;
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.superHeader span {
- color: rgb(195, 196, 210);
- background-color: transparent;
- font-weight: bold;
- text-transform: uppercase;
-}
-
-.superHeader a {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.superHeader a:hover {
- color: rgb(193, 102, 90);
- background-color: transparent;
- text-decoration: none;
-}
-
-.midHeader {
- color: white;
- background-color: rgb(61, 92, 122);
- margin: 0;
- padding: 0.26ex 10px;
-}
-
-.headerTitle {
- font-size: 300%;
- margin: 0;
- padding: 0;
-}
-
-.headerSubTitle {
- font-size: 151%;
- font-weight: normal;
- font-style: italic;
- margin: 0 0 1ex 0;
- padding: 0;
-}
-
-.headerLogin {
- border: 1px solid rgb(255,255,255);
- text-align: right;
- padding: 1ex;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-
-.headerLinks {
- text-align: right;
- margin: 0;
- padding: 0 0 2ex 0;
- position: absolute;
- right: 1.5em;
- top: 3.5em;
-}
-
-.headerLinks a {
- color: white;
- background-color: transparent;
- text-decoration: none;
- margin: 0;
- padding: 0 0 0.5ex 0;
- display: block;
-}
-
-.headerLinks a:hover {
- color: rgb(195, 196, 210);
- background-color: transparent;
- text-decoration: underline;
-}
-
-.subHeader {
- color: white;
- background-color: rgb(117, 144, 174);
- margin: 0;
- padding: 0.5ex 10px;
-}
-
-.subHeader a,.subHeader .highlight {
- color: white;
- background-color: transparent;
- font-size: 110%;
- font-weight: bold;
- text-decoration: none;
- margin: 0;
- padding: 0 0.25ex 0 0;
-}
-
-.subHeader a:hover,.subHeader .highlight {
- color: rgb(255, 204, 0);
- background-color: transparent;
- text-decoration: none;
-}
-
/* ##### Main Copy ##### */
-#main-copy {
- margin: 0;
- padding: 0.5em 10px;
- clear: left;
-}
-#main-copy h1 {
- color: rgb(117, 144, 174);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-size: 200%;
- margin: 0;
- padding: 0;
-}
-
-#main-copy h2 {
- color: rgb(61, 92, 122);
- background-color: transparent;
- font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif;
- font-weight: normal;
- font-size: 151%;
- margin: 0;
- padding: 1ex 0 0 0;
-}
-
-#main-copy p {
- line-height: 1.75em;
- margin: 1em 0 1.5em 0;
- padding: 0;
-}
-
.column1,.column2,.column3 {
margin: 1em 0;
padding: 0 2.5%;
@@ -243,35 +27,34 @@
border-left: 1px solid;
border-right: 1px solid;
border-top: 1px solid;
+ border-color: rgb(61, 92, 122);
+ background-color: rgb(61, 92, 122);
}
.column1 .feed_headline {
- border-color: yellow;
- background-color: yellow;
+
}
.column1 ul {
margin-top: 0em;
- border: 1px solid yellow;
+ border: 1px solid rgb(61, 92, 122);
}
.column2 .feed_headline {
- border-color: red;
- background-color: red;
+
}
.column2 ul {
- border: 1px solid red;
+ border: 1px solid rgb(61, 92, 122);
margin-top: 0;
}
.column3 .feed_headline {
- border-color: green;
- background-color: green;
+
}
.column3 ul {
- border: 1px solid green;
+ border: 1px solid rgb(61, 92, 122);
margin-top: 0;
}
@@ -325,37 +108,4 @@
.dividingBorderAbove {
border-top: 1px solid rgb(204, 204, 204);
-}
-
-/* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
- * that don't require the creation of new classes - but which are not
- * supported by MSIE - are the following:
- *
- * .rowOfBoxes > div:first-child {
- * border-left: none;
- * }
- *
- * .rowOfBoxes + .rowOfBoxes {
- * border-top: 1px solid rgb(204,204,204);
- * }
- */ /* ##### Footer ##### */
-#footer {
- color: rgb(51, 51, 102);
- background-color: rgb(239, 239, 239);
- font-size: 87%;
- text-align: center;
- line-height: 1.25em;
- margin: 2em 0 0 0;
- padding: 1ex 10px;
- clear: left;
-}
-
-#footer a {
- color: rgb(0, 68, 204);
- background-color: transparent;
- text-decoration: underline;
-}
-
-#footer a:hover {
- text-decoration: none;
}
\ No newline at end of file
Modified: trunk/styles/default/page_personal.tpl
===================================================================
--- trunk/styles/default/page_personal.tpl 2007-01-08 18:56:41 UTC (rev 97)
+++ trunk/styles/default/page_personal.tpl 2007-01-09 21:45:26 UTC (rev 98)
@@ -8,8 +8,11 @@
<meta name="generator" content="haran" />
<link rel="stylesheet" type="text/css" href="./styles/default/page_personal-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" />
+ <link rel="stylesheet" type="text/css" href="./styles/default...
[truncated message content] |
