Index: openacs.org-dev/www/templates/default-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-content.adp,v
diff -u -r1.7 -r1.8
--- openacs.org-dev/www/templates/default-content.adp 28 Sep 2002 21:17:48 -0000 1.7
+++ openacs.org-dev/www/templates/default-content.adp 28 Oct 2002 01:05:02 -0000 1.8
@@ -4,8 +4,8 @@
<h2 class="page_title">@pa.title@</h2>
<span class="context">
-@pa.context_bar@</span><br><br>
-
+@pa.context_bar@</span>
+<hr noshade />
<span class="reg">
<b>@pa.description@</b>
<br>
Index: openacs.org-dev/www/templates/default-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-index.adp,v
diff -u -r1.5 -r1.6
--- openacs.org-dev/www/templates/default-index.adp 28 Sep 2002 21:17:48 -0000 1.5
+++ openacs.org-dev/www/templates/default-index.adp 28 Oct 2002 01:05:02 -0000 1.6
@@ -5,7 +5,7 @@
<span class="context">
@pa.context_bar@
</span>
-
+<hr noshade />
<p>
<if @pa.content@ not nil>
@pa.content@
Index: openacs.org-dev/www/templates/default-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-index.tcl,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/www/templates/default-index.tcl 28 Sep 2002 21:17:48 -0000 1.2
+++ openacs.org-dev/www/templates/default-index.tcl 28 Oct 2002 01:05:02 -0000 1.3
@@ -23,5 +23,5 @@
set etp_link [etp::get_etp_link]
#don't show context bar if 2ndlevel page
-if {[ns_conn urlc] < 2} {set pa(context_bar) ""}
+#if {[ns_conn urlc] < 2} {set pa(context_bar) ""}
Index: openacs.org-dev/www/templates/general-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/general-master.adp,v
diff -u -r1.4 -r1.5
--- openacs.org-dev/www/templates/general-master.adp 28 Sep 2002 21:22:19 -0000 1.4
+++ openacs.org-dev/www/templates/general-master.adp 28 Oct 2002 01:05:02 -0000 1.5
@@ -15,8 +15,6 @@
<!-- END HEADER -->
-
-
<slave>
Index: openacs.org-dev/www/templates/homepage-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/homepage-index.adp,v
diff -u -r1.16 -r1.17
--- openacs.org-dev/www/templates/homepage-index.adp 3 Aug 2002 11:08:09 -0000 1.16
+++ openacs.org-dev/www/templates/homepage-index.adp 28 Oct 2002 01:05:02 -0000 1.17
@@ -1,7 +1,7 @@
<master>
<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+
<table cellpadding=0 cellspacing=0 border=0 width="100%">
<tr>
<!-- left side cell -->
Index: openacs.org-dev/www/templates/homepage-new-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/homepage-new-index.adp,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/www/templates/homepage-new-index.adp 20 Sep 2002 00:45:59 -0000 1.6
+++ openacs.org-dev/www/templates/homepage-new-index.adp 28 Oct 2002 01:05:02 -0000 1.7
@@ -58,4 +58,4 @@
@pa.content@
</div>
-<!-- END MAIN CONTENT -->
\ No newline at end of file
+<!-- END MAIN CONTENT -->
Index: openacs.org-dev/www/templates/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/css/main.css,v
diff -u -r1.18 -r1.19
--- openacs.org-dev/www/templates/css/main.css 28 Sep 2002 21:18:03 -0000 1.18
+++ openacs.org-dev/www/templates/css/main.css 28 Oct 2002 01:05:09 -0000 1.19
@@ -42,8 +42,9 @@
}
.item {
padding-bottom: 0px;
- margin-bottom: 5px;
+ margin-bottom: 8px;
margin-top: 0px;
+
}
div.header {
Index: openacs.org-dev/www/templates/widgets/about.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/about.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/templates/widgets/about.tcl 14 Aug 2002 15:06:49 -0000 1.1
+++ openacs.org-dev/www/templates/widgets/about.tcl 28 Oct 2002 01:05:17 -0000 1.2
@@ -1,4 +1,4 @@
etp::get_page_attributes
-etp::get_content_items
+#etp::get_content_items
etp::get_content_items -package_id 3981 -result_name about
Index: openacs.org-dev/www/templates/widgets/navigation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/navigation.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/templates/widgets/navigation.tcl 8 Aug 2002 16:40:52 -0000 1.1
+++ openacs.org-dev/www/templates/widgets/navigation.tcl 28 Oct 2002 01:05:17 -0000 1.2
@@ -10,8 +10,9 @@
px_multirow_nav {
{/ "Home" 0}
- {/news/ "News & Events" 0}
- {/community/ "Forums & Community" 0}
+ {/news/ "News" 0}
+ {/forums/ "Forums" 0}
+ {/community/ "Community" 0}
{/projects/ "Projects" 0}
{/doc/ "Documentation" 0}
Index: openacs.org-dev/www/templates/widgets/news.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/news.adp,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/www/templates/widgets/news.adp 9 Aug 2002 10:39:08 -0000 1.2
+++ openacs.org-dev/www/templates/widgets/news.adp 28 Oct 2002 01:05:17 -0000 1.3
@@ -10,7 +10,8 @@
</multiple>
<if @news_items:rowcount@ eq 0>
- There are no news.
+<p> There are no recent news items. </p>
+<p> <a href="/news/?view=archive">Read</a> archived news items.</p>
</if>
<if @news_items:rowcount@ gt @n_news_items@>
Index: openacs.org-dev/www/templates/widgets/news.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/news.tcl,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/www/templates/widgets/news.tcl 8 Aug 2002 21:21:21 -0000 1.3
+++ openacs.org-dev/www/templates/widgets/news.tcl 28 Oct 2002 01:05:17 -0000 1.4
@@ -11,7 +11,7 @@
set n_news_items 2
set news_limit [expr $n_news_items + 1]
-set max_post_age_days 14
+set max_post_age_days 60
db_multirow news_items news_items_select "
select item_id,
Index: openacs.org-dev/www/templates/widgets/postings.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/postings.adp,v
diff -u -r1.7 -r1.8
--- openacs.org-dev/www/templates/widgets/postings.adp 20 Sep 2002 00:46:58 -0000 1.7
+++ openacs.org-dev/www/templates/widgets/postings.adp 28 Oct 2002 01:05:17 -0000 1.8
@@ -7,12 +7,13 @@
<p class="title">
<a href="/forums/forum-view?forum_id=@forum_posts.forum_id@">@forum_posts.forum_name@</a>
</p>
-
<group column="forum_id">
<p class="item">
- <a href="/forums/message-view?message_id=@forum_posts.message_id@">@forum_posts.subject@</a>
+
+ <a href="/forums/message-view?message_id=@forum_posts.message_id@">@forum_posts.subject@</a>
</p>
</group>
+</ul>
</div>
</if>
</multiple>
Index: openacs.org-dev/www/templates/widgets/postings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/postings.tcl,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/www/templates/widgets/postings.tcl 7 Oct 2002 16:55:13 -0000 1.6
+++ openacs.org-dev/www/templates/widgets/postings.tcl 28 Oct 2002 01:05:17 -0000 1.7
@@ -8,7 +8,7 @@
forum_posts:multirow
}
-set n_posts 6
+set n_posts 10
set forum_limit [expr $n_posts + 1]
set max_post_age_days 7
@@ -36,5 +36,10 @@
order by forum_name
limit $forum_limit
" {
- regsub -all {/} $subject { / } subject
+ # insert spaces into words that are longer than 20 characters. otherwise
+ # the layout would barf (box becomes too wide because of non-breaking text).
+ regsub -all {(\w{15,}?)} $subject {\1 } subject
}
+
+
+