From 899593d758b4f7e0c44649e910a833dd66413492 Mon Sep 17 00:00:00 2001
From: Tim Vroom
Date: Mon, 11 Jul 2005 02:17:21 +0000
Subject: [PATCH] CSS updates
---
.../templates/commentsearch;search;default | 33 ++-
plugins/Search/templates/data;search;default | 28 ++-
.../templates/journalsearch;search;default | 34 ++-
.../Search/templates/nosearch;search;default | 18 +-
.../templates/pagination;search;default | 6 +-
.../templates/pollsearch;search;default | 29 ++-
.../Search/templates/rsssearch;search;default | 32 ++-
.../templates/searchform;search;default | 62 +++---
.../templates/storysearch;search;default | 60 +++--
.../Search/templates/subsearch;search;default | 51 +++--
.../templates/usersearch;search;default | 40 ++--
.../templates/commentsearch;searchtoo;default | 8 +-
.../templates/journalsearch;searchtoo;default | 6 +-
.../templates/nosearch;searchtoo;default | 2 +-
.../templates/pollsearch;searchtoo;default | 4 +-
.../templates/searchform;searchtoo;default | 28 +--
.../templates/storysearch;searchtoo;default | 6 +-
.../templates/subsearch;searchtoo;default | 6 +-
.../Sections/templates/data;sections;default | 16 +-
.../templates/delSectCancel;sections;default | 2 +-
.../templates/delSection;sections;default | 14 +-
.../templates/editSection;sections;default | 210 +++++++++---------
.../templates/listSections;sections;default | 8 +-
23 files changed, 395 insertions(+), 308 deletions(-)
diff --git a/plugins/Search/templates/commentsearch;search;default b/plugins/Search/templates/commentsearch;search;default
index ac3be7dbd..8d1d4f913 100644
--- a/plugins/Search/templates/commentsearch;search;default
+++ b/plugins/Search/templates/commentsearch;search;default
@@ -11,24 +11,33 @@ en_US
__name__
commentsearch
__template__
-This search covers only subjects of comments that are posted.
+
+
+
__seclev__
100
__version__
diff --git a/plugins/Search/templates/data;search;default b/plugins/Search/templates/data;search;default
index 08e5318de..6fb95e537 100644
--- a/plugins/Search/templates/data;search;default
+++ b/plugins/Search/templates/data;search;default
@@ -19,31 +19,45 @@ __template__
[% CASE 'nousers' %]
[% returnme.data_constant = 1 %]
- No usernames were found that match your query.
+
+ No usernames were found that match your query.
+
[% CASE 'nostories' %]
[% returnme.data_constant = 1 %]
- No stories were found that match your query.
+
+ No stories were found that match your query.
+
[% CASE 'nocomments' %]
[% returnme.data_constant = 1 %]
- No comments were found that match your query.
+
[% CASE 'nopolls' %]
[% returnme.data_constant = 1 %]
- No poll questions were found that match your query.
+
+ No poll questions were found that match your query.
+
[% CASE 'nojournals' %]
[% returnme.data_constant = 1 %]
- No journals were found to match your query.
+
+ No journals were found to match your query.
+
[% CASE 'nosubmissions' %]
[% returnme.data_constant = 1 %]
- No submissions were found to match your query.
+
+ No submissions were found to match your query.
+
[% CASE 'norss' %]
[% returnme.data_constant = 1 %]
- No rss entries were found to match your query.
+
[% CASE 'all_sections' %]
[% returnme.data_constant = 1 %]
diff --git a/plugins/Search/templates/journalsearch;search;default b/plugins/Search/templates/journalsearch;search;default
index 33acad7a5..f99e751d0 100644
--- a/plugins/Search/templates/journalsearch;search;default
+++ b/plugins/Search/templates/journalsearch;search;default
@@ -11,20 +11,32 @@ en_US
__name__
journalsearch
__template__
+
+
[% FOREACH journal=entries %]
-
[% journal.description %]
-
On [% Slash.timeCalc(journal.date) %]
- [% journal.article %]
-
- Author: [% journal.nickname | strip_literal %]
- [% IF journal.score %]
- Score: ([% journal.score %])
- [% END %]
-
-
+
+
+
+ On [% Slash.timeCalc(journal.date) %]
+
+
+ [% journal.article %]
+
+
+ [% IF journal.score %]
+
+ Score: ([% journal.score %])
+
+ [% END %]
+
[% END %]
[% PROCESS pagination %]
-
+
+
__seclev__
100
diff --git a/plugins/Search/templates/nosearch;search;default b/plugins/Search/templates/nosearch;search;default
index 36d2fdf99..4c48bf39a 100644
--- a/plugins/Search/templates/nosearch;search;default
+++ b/plugins/Search/templates/nosearch;search;default
@@ -11,16 +11,18 @@ en_US
__name__
nosearch
__template__
-Sorry, search is down at the moment.
+
+
+Sorry, search is down at the moment.
Until it's back up, you may wish to search
[% constants.sitename %] through Google:
-
-
-
+
+
+
__seclev__
100
__version__
diff --git a/plugins/Search/templates/pagination;search;default b/plugins/Search/templates/pagination;search;default
index a4aee439c..475b6f0ae 100755
--- a/plugins/Search/templates/pagination;search;default
+++ b/plugins/Search/templates/pagination;search;default
@@ -11,18 +11,20 @@ en_US
__name__
pagination
__template__
+
__seclev__
100
__version__
diff --git a/plugins/Search/templates/pollsearch;search;default b/plugins/Search/templates/pollsearch;search;default
index b608cd5b4..4bf38f436 100644
--- a/plugins/Search/templates/pollsearch;search;default
+++ b/plugins/Search/templates/pollsearch;search;default
@@ -11,22 +11,31 @@ en_US
__name__
pollsearch
__template__
+
+
[% FOREACH poll = polls %]
[% skin = Slash.db.getSkin(poll.skin) %]
[% link = skin.url ? skin.url : gSkin.rootdir %]
-
[% poll.question %]
-
- On [% Slash.timeCalc(poll.date) %]
- Voters: [% poll.voters %]
- [% IF poll.score %]
+
+
+
+ On [% Slash.timeCalc(poll.date) %]
+
+
+ Voters: [% poll.voters %]
+
+ [% IF poll.score %]
+
Score: [% poll.score %]
- [% END %]
-
-
+
+ [% END %]
+
[% END %]
[% PROCESS pagination %]
-
-
+
+
__seclev__
100
__version__
diff --git a/plugins/Search/templates/rsssearch;search;default b/plugins/Search/templates/rsssearch;search;default
index 03920fba8..1530fe558 100644
--- a/plugins/Search/templates/rsssearch;search;default
+++ b/plugins/Search/templates/rsssearch;search;default
@@ -12,20 +12,30 @@ __name__
rsssearch
__template__
[% USE Slash %]
+
+
__seclev__
100
__version__
diff --git a/plugins/Search/templates/searchform;search;default b/plugins/Search/templates/searchform;search;default
index 4acebef65..21aa713dd 100644
--- a/plugins/Search/templates/searchform;search;default
+++ b/plugins/Search/templates/searchform;search;default
@@ -11,45 +11,45 @@ en_US
__name__
searchform
__template__
-
-
+
[% IF tref.image %]
-
+
[% END %]
-
[% IF sections || topics %]
-
[%
topics = Slash.db.getTopicTree();
@@ -84,7 +84,8 @@ __template__
listex = listnames.size mod 3;
i = 0;
%]
-[% constants.sitename %]
+
+
[% constants.sitename %]
[% IF !topics.${form.tid}.nexus && topics.${form.tid}.parent;
thisparent = topics.${form.tid}.parent.keys.nsort.0;
IF thisparent == constants.mainpage_nexus_tid;
@@ -95,14 +96,12 @@ __template__
[% END; END; IF form.tid %]
::
[% topics.${form.tid}.textname %]
[% END; IF listnames.size %]
-Topics
+Topics
[% END %]
-
[% IF listnames.size %]
-
[% FOREACH s = listnames.keys.sort -%]
[% s %] [%
@@ -117,15 +116,12 @@ END %]
END;
%]
-
-[% END; END # FOREACH %]
+
[% END # IF listnames.size %]
-
+
[% END # IF sections || topics %]
-
-
__seclev__
100
diff --git a/plugins/Search/templates/storysearch;search;default b/plugins/Search/templates/storysearch;search;default
index dda840796..c8e584fe5 100644
--- a/plugins/Search/templates/storysearch;search;default
+++ b/plugins/Search/templates/storysearch;search;default
@@ -11,7 +11,9 @@ en_US
__name__
storysearch
__template__
-[% FOREACH story=stories %]
+
+
+ [% FOREACH story=stories %]
[% skin = Slash.db.getSkin(story.skid);
storylinks = Slash.linkStory({
section => skin.name,
@@ -21,26 +23,42 @@ __template__
'link' => story.title
})
%]
-
[% storylinks.1 | strip_html %]
-[% IF user.is_admin %][
Edit ][% END %]
-
-
On [% Slash.timeCalc(story.time, '%B %o, %Y') %] with [% story.commentcount %] comments
- [% story.introtext %]
-
- [% IF skin.name == 'mainpage' %]Main [% ELSE %][% skin.title %] [% END %] >
- [% FOREACH tid = story.tids %]
- [% topic = Slash.db.getTopic(tid) %]
- [% topic.textname %] [% ", " UNLESS loop.last %]
- [% END %]
-
- [% IF story.score %]
- Score: [% story.score %]
- [% END %]
-
-
-[% END %]
-[% PROCESS pagination %]
-
+
+
+
+ On [% Slash.timeCalc(story.time, '%B %o, %Y') %] with [% story.commentcount %] comments
+
+
+ [% story.introtext %]
+
+
+ [% IF skin.name == 'mainpage' %]
Main [% ELSE %]
[% skin.title %] [% END %] »
+ [% FOREACH tid = story.tids %]
+ [% topic = Slash.db.getTopic(tid) %]
+
[% topic.textname %] [% ", " UNLESS loop.last %]
+ [% END %]
+
+ [% IF story.score %]
+
+ Score: [% story.score %]
+
+ [% END %]
+
+ [% END %]
+ [% PROCESS pagination %]
+
+
__seclev__
100
diff --git a/plugins/Search/templates/subsearch;search;default b/plugins/Search/templates/subsearch;search;default
index d3a3da4b1..6d50b111c 100644
--- a/plugins/Search/templates/subsearch;search;default
+++ b/plugins/Search/templates/subsearch;search;default
@@ -11,33 +11,52 @@ en_US
__name__
subsearch
__template__
-
+
+
[% FOREACH entry = entries %]
-
[% entry.subj %]
-
On [% Slash.timeCalc(entry.time) %]
- [% entry.story %]
-
+
+
+
+ On [% Slash.timeCalc(entry.time) %]
+
+
+ [% entry.story %]
+
[% submission_state = Slash.db.getDescriptions('submission-state') %]
[% skin = Slash.db.getSkin(entry.skid) %]
- Section: [% IF skin.name == 'mainpage' %]
Main [% ELSE %]
[% skin.title %] [% END %] >
+
+ Section:
+ [% IF skin.name == 'mainpage' %]
+
Main
+ [% ELSE %]
+
[% skin.title %]
+ [% END %]
+ >
[% FOREACH tid = entry.tid %]
[% topic = Slash.db.getTopic(tid) %]
-
[% topic.textname %] [% ", " UNLESS loop.last %]
- [% END %]
- State: [% del = entry.del; submission_state.$del %]
+
[% topic.textname %] [% ", " UNLESS loop.last %]
+ [% END %]
+
+
+ State: [% del = entry.del; submission_state.$del %]
+
[% IF entry.note %]
- Note: [% entry.note %]
+
+ Note: [% entry.note %]
+
[% END %]
[% IF entry.score %]
- Score: [% entry.score %]
+
+ Score: [% entry.score %]
+
[% END %]
-
-
+
[% END %]
-
[% PROCESS pagination %]
-
-
+
+
__seclev__
100
__version__
diff --git a/plugins/Search/templates/usersearch;search;default b/plugins/Search/templates/usersearch;search;default
index 5c30f2488..f26059230 100644
--- a/plugins/Search/templates/usersearch;search;default
+++ b/plugins/Search/templates/usersearch;search;default
@@ -11,42 +11,38 @@ en_US
__name__
usersearch
__template__
-
+
+
[% FOREACH thisuser=users %]
-
+
+
[% END %]
-
[% PROCESS pagination %]
-
-
+
+
__seclev__
100
__version__
diff --git a/plugins/SearchToo/templates/commentsearch;searchtoo;default b/plugins/SearchToo/templates/commentsearch;searchtoo;default
index 438b58594..00c5d6811 100755
--- a/plugins/SearchToo/templates/commentsearch;searchtoo;default
+++ b/plugins/SearchToo/templates/commentsearch;searchtoo;default
@@ -19,17 +19,17 @@ __template__
[% user_email = Slash.db.getUser(comment.uid, ['fakeemail', 'nickname']) %]
[% comment.subject %]
- by [% user_email.nickname | strip_literal %] on [% Slash.timeCalc(comment.date) %]
-
+ by [% user_email.nickname | strip_literal %] on [% Slash.timeCalc(comment.date) %]
+
Attached to: [% comment.title %] posted on [% Slash.timeCalc(comment.ts) %]
[% IF comment.score %]
Score: [% comment.score %]
[% END %]
-
+
[% END %]
[% PROCESS pagination %]
-
+
__seclev__
diff --git a/plugins/SearchToo/templates/journalsearch;searchtoo;default b/plugins/SearchToo/templates/journalsearch;searchtoo;default
index ee8deb2c9..07d6a83fe 100644
--- a/plugins/SearchToo/templates/journalsearch;searchtoo;default
+++ b/plugins/SearchToo/templates/journalsearch;searchtoo;default
@@ -13,14 +13,14 @@ journalsearch
__template__
[% FOREACH journal=results.records %]
[% journal.description %]
- On [% Slash.timeCalc(journal.date) %]
+ On [% Slash.timeCalc(journal.date) %]
[% shorten( Slash.strip_notags(journal.article) ) %]
-
+
Author: [% journal.nickname | strip_literal %]
[% IF journal.score %]
Score: ([% journal.score %])
[% END %]
-
+
[% END %]
[% PROCESS pagination %]
diff --git a/plugins/SearchToo/templates/nosearch;searchtoo;default b/plugins/SearchToo/templates/nosearch;searchtoo;default
index 43171b497..a3308a1a2 100755
--- a/plugins/SearchToo/templates/nosearch;searchtoo;default
+++ b/plugins/SearchToo/templates/nosearch;searchtoo;default
@@ -15,7 +15,7 @@ __template__
Sorry, search is down at the moment.
Until it's back up, you may wish to search
[% constants.sitename %] through Google:
-
@@ -123,7 +123,7 @@ Topics
[% IF listnames.size %]
-
+
[% FOREACH s = listnames.keys.sort -%]
[% s %] [%
@@ -138,7 +138,7 @@ END %]
END;
%]
-
+
diff --git a/plugins/SearchToo/templates/storysearch;searchtoo;default b/plugins/SearchToo/templates/storysearch;searchtoo;default
index c5e29b3b1..e0113708a 100755
--- a/plugins/SearchToo/templates/storysearch;searchtoo;default
+++ b/plugins/SearchToo/templates/storysearch;searchtoo;default
@@ -24,9 +24,9 @@ __template__
[% storylinks.1 | strip_html %]
[% IF user.is_admin %][ Edit ][% END %]
- On [% Slash.timeCalc(story.time, '%B %o, %Y') %] with [% story.commentcount %] comments
+ On [% Slash.timeCalc(story.time, '%B %o, %Y') %] with [% story.commentcount %] comments
[% shorten( Slash.strip_notags(story.introtext) ) %]
-
+
[% IF skin.name == 'mainpage' %]Main [% ELSE %][% skin.title %] [% END %] >
[% FOREACH tid = story.tids %]
[% topic = Slash.db.getTopic(tid) %]
@@ -36,7 +36,7 @@ __template__
[% IF story.score %]
Score: [% story.score %]
[% END %]
-
+
[% END %]
[% PROCESS pagination %]
diff --git a/plugins/SearchToo/templates/subsearch;searchtoo;default b/plugins/SearchToo/templates/subsearch;searchtoo;default
index 2a6dfed05..f7bf1bad5 100644
--- a/plugins/SearchToo/templates/subsearch;searchtoo;default
+++ b/plugins/SearchToo/templates/subsearch;searchtoo;default
@@ -14,9 +14,9 @@ __template__
[% FOREACH entry = results.records %]
[% entry.subj %]
- On [% Slash.timeCalc(entry.time) %]
+ On [% Slash.timeCalc(entry.time) %]
[% shorten( Slash.strip_notags(entry.story) ) %]
-
+
[% submission_state = Slash.db.getDescriptions('submission-state') %]
[% skin = Slash.db.getSkin(entry.skid) %]
Section: [% IF skin.name == 'mainpage' %]Main [% ELSE %][% skin.title %] [% END %] >
@@ -31,7 +31,7 @@ __template__
[% IF entry.score %]
Score: [% entry.score %]
[% END %]
-
+
[% END %]
diff --git a/plugins/Sections/templates/data;sections;default b/plugins/Sections/templates/data;sections;default
index 25f3dabc4..4f0b69855 100644
--- a/plugins/Sections/templates/data;sections;default
+++ b/plugins/Sections/templates/data;sections;default
@@ -23,20 +23,20 @@ __template__
[% CASE 'notadmin' %]
[% returnme.data_constant = 1 %]
-
I woke up in the Soho bar when a policeman knew my name. He said,
+ I woke up in the Soho bar when a policeman knew my name. He said,
"You can go sleep at home tonite if you can get up and walk away."
I staggered back to the underground and a breeze threw back my
head. I remember throwing punches around and preachin' from my chair.
- From 'Who Are You' by God (aka Pete Townshend)
+ From 'Who Are You' by God (aka Pete Townshend)
[% CASE 'insert' %]
- Inserted [% section %]
+ Inserted [% section %]
[% CASE 'update' %]
- Updated [% section %]
+ Updated [% section %]
[% CASE 'failed' %]
- Failed to create/update [% section %]
+ Failed to create/update [% section %]
[% CASE 'addhead' %]
[% returnme.data_constant = 1 %]
@@ -53,11 +53,11 @@ __template__
Saving [% form.section | strip_nohtml %] Section
[% CASE 'subsection_added' %]
- Subsection '[% form.new_subsection %]' added.
+ Subsection '[% form.new_subsection %]' added.
[% CASE 'subsection_removed' %]
- Operation "[% form.action %]" completed.
- Subsection #[% form.DEL_subsection %] removed.
+ Operation "[% form.action %]" completed.
+ Subsection #[% form.DEL_subsection %] removed.
[% END %]
diff --git a/plugins/Sections/templates/delSectCancel;sections;default b/plugins/Sections/templates/delSectCancel;sections;default
index ee7f32a9b..e0ba28f45 100644
--- a/plugins/Sections/templates/delSectCancel;sections;default
+++ b/plugins/Sections/templates/delSectCancel;sections;default
@@ -12,7 +12,7 @@ en_US
__name__
delSectCancel
__template__
-Canceled deletion of [% section %].
+Canceled deletion of [% section %].
__seclev__
10000
__version__
diff --git a/plugins/Sections/templates/delSection;sections;default b/plugins/Sections/templates/delSection;sections;default
index 1ea693d46..873e3932d 100644
--- a/plugins/Sections/templates/delSection;sections;default
+++ b/plugins/Sections/templates/delSection;sections;default
@@ -13,14 +13,14 @@ en_US
__name__
delSection
__template__
-
+
+
+
+
+
__seclev__
10000
diff --git a/plugins/Sections/templates/editSection;sections;default b/plugins/Sections/templates/editSection;sections;default
index 7fba0698b..e5724015f 100644
--- a/plugins/Sections/templates/editSection;sections;default
+++ b/plugins/Sections/templates/editSection;sections;default
@@ -19,39 +19,39 @@ __name__
editSection
__template__
[
-Stories |
-Submissions |
-Preview
+Stories |
+Submissions |
+Preview
]
[% # Conditions for subsection delete confirmation. If true, show subform.
IF form.DEL_subsection && !form.confirm;
key = "del_subsection_${form.DEL_subsection}" %]
-
-
+
+
[% END %]
-
__seclev__
10000
diff --git a/plugins/Sections/templates/listSections;sections;default b/plugins/Sections/templates/listSections;sections;default
index d5f5fdac8..abb04be4e 100644
--- a/plugins/Sections/templates/listSections;sections;default
+++ b/plugins/Sections/templates/listSections;sections;default
@@ -14,12 +14,12 @@ __name__
listSections
__template__
[% FOREACH section = sections %][% IF section.1 %]
-[% section.0 %] [% section.1 %]
[% END %]
+[% section.0 %] [% section.1 %]
[% END %]
[% END %]
-
-
-
+
+
+
__seclev__
10000
- - Attached to: [% comment.title %] posted on [% Slash.timeCalc(comment.ts) %]
+
+ [% comment.subject %] +
++
+
- - +