Index: openacs-4/packages/acs-admin/www/developer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/developer.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/developer.adp 21 Sep 2003 19:21:47 -0000 1.1
@@ -0,0 +1,102 @@
+<master>
+ <property name="title">@page_title;noquote@</property>
+ <property name="context">@context;noquote@</property>
+
+<table bgcolor="#cccccc" cellpadding="0" cellspacing="0" border="0" align="right">
+ <tr>
+ <td>
+ <table cellspacing="1" cellpadding="4" border="0">
+ <tr bgcolor="#ccccff">
+ <th>
+ Quick Links
+ </th>
+ </tr>
+ <tr bgcolor="#eeeeee">
+ <td>
+ <a href="http://openacs.org/">Developer Community</a>
+ </td>
+ </tr>
+ <tr bgcolor="#eeeeee">
+ <td>
+ <a
+ href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS Q&A forum</a>
+ </td>
+ </tr>
+ <tr bgcolor="#eeeeee">
+ <td>
+ <a href="http://openacs.org/forums/">Other OpenACS forums</a>
+ </td>
+ </tr>
+ <tr bgcolor="#eeeeee">
+ <td>
+ <a href="http://openacs.org/bugtracker/openacs/">Report a bug</a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+
+<h3>Tools For Developers</h3>
+
+<include src="/packages/acs-admin/lib/developer-services">
+
+
+ <h3>Configure This Site</h3>
+
+ <p>Thank you for using OpenACS. Please write to us at the <a
+ href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS discussion forums</a> to let
+ us know of your experience with installing and using OpenACS. </p>
+
+ <ul>
+ <li>
+ <b>Customize the front page</b>. Edit the files
+ <code>@acs_root_dir@/www/index.adp</code> and
+ <code>@acs_root_dir@/www/index.tcl</code>. (<a
+ href="/doc/templates.html">More information</a>)
+ </li>
+ <li>Change the site's overall appearance by <b>editing the master template</b> that wraps every page. The master template is <code>@acs_root_dir@/www/default-master.adp</code>. An ADP file is almost like HTML, except with a few extra bells
+ and whistles (<a href="/doc/acs-templating/designer-guide.html"
+ title="Templating Designer's Guide">more information</a>).</li>
+
+ <li><a href="/admin/" title="Package and User
+ administration">Site Administration</a>
+ <ul>
+ <li>Invite <a href="/acs-admin/users/">Users</a> or create <a href="/admin/groups/">Groups</a> (<a href="doc/permissions.html">More information</a>)</li>
+ <li><b>Download contributed packages</b> at the <a href="http://openacs.org/software/"
+ title="Software Page on openacs.org">OpenACS Software Page</a>.</li>
+ <li><b>Install packages</b>. In addition to the Core packages,
+ which are already installed, OpenACS ships with many Standard
+ packages with additional functionality. Install these packages
+ with the <a href="/acs-admin/apm/" title="OpenACS Package Manager on your server">Package Manager</a>.</li>
+
+ <li>Use the <a href="/admin/site-map/"
+ title="The Site Map on your server">Site Map</a> to <b>mount and configure packages</b>. </li>
+ </ul>
+</ul>
+
+
+ <h3>Learn More</h3>
+ <ul>
+ <li>OpenACS <a href="/doc/" title="Documentation Home on your
+ server"><b>Documentation</b></a> on this server.
+ <li><a href="/api-doc/"
+ title="API Documentation">API documentation</a>.
+ </li>
+ <li>The home of the <b>OpenACS community</b> is
+ at <a href="http://openacs.org/"
+ title="OpenACS Developer Community">http://openacs.org</a>.</li>
+ <li>Visit the <a href="http://openacs.org/forums/"
+ title="OpenACS Discussion Forums">discussion forums</a> on
+ openacs.org, including the <a
+ href="http://openacs.org/forums/forum-view?forum_id=14013"
+ title="OpenACS discussion forum on openacs.org">OpenACS Q&A
+ forum</a>.</li>
+ <li>Post <b>bugs</b> and <b>feature requests</b> in the <a href="http://openacs.org/bugtracker/openacs/"
+ title="Software Development Manager on openacs.org">Bug
+ Tracker</a>.
+ </li>
+ <li>Please read our <a href="http://openacs.org/contribute">conbribution instructions</a> to learn how you can become involved in the OpenACS project.
+ If you develop your own OpenACS packages there is a good chance they will be useful to other people in the community and after review they can be included in the OpenACS distribution.</li>
+ </ul>
Index: openacs-4/packages/acs-admin/www/developer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/developer.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/developer.tcl 21 Sep 2003 19:21:47 -0000 1.1
@@ -0,0 +1,13 @@
+ad_page_contract {
+ Developer's site-wide admin home page.
+
+ @author Lars Pind (lars@collaboraid.biz)
+
+ @creation-date September 21, 2003
+ @cvs-id $Id: developer.tcl,v 1.1 2003/09/21 19:21:47 lars Exp $
+}
+
+set page_title "Developer's Administration"
+set context [list $page_title]
+
+set acs_root_dir [acs_root_dir]
Index: openacs-4/packages/acs-admin/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/index.adp 17 Sep 2003 21:56:22 -0000 1.6
+++ openacs-4/packages/acs-admin/www/index.adp 21 Sep 2003 19:21:47 -0000 1.7
@@ -27,8 +27,6 @@
<include src="/packages/acs-admin/lib/service-parameters">
-<h3>Tools For Developers</h3>
-
-<include src="/packages/acs-admin/lib/developer-services">
-
-
+<p>
+ <b>»</b> <a href="developer">Developer's Admin</a>
+</p>
Index: openacs-4/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/www/index.adp 18 Sep 2003 17:13:51 -0000 1.20
+++ openacs-4/www/index.adp 21 Sep 2003 19:21:17 -0000 1.21
@@ -1,138 +1,29 @@
<master>
-<property name="title">@system_name;noquote@</property>
+ <property name="title">@system_name;noquote@</property>
-<table cellspacing="4" cellpadding="4" border="0">
- <tr>
- <td valign="top">
+<if @user_id@ eq 0>
+ <div id="login-box" style="float: right;">
+ <include src="/packages/acs-subsite/lib/login" return_url="/" username="@username@" authority_id="@authority_id@" &="__adp_properties">
+ </div>
+</if>
+
<p><b>Open Architecture Community System @acs_version@ </b>at
- @system_name@. Thank you for using OpenACS. Please write to us at the <a
- href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS discussion forums</a> to let
- us know of your experience with installing and using OpenACS. </p>
+ @system_name@.
<p><if @user_id@ gt 0>
- You are currently logged in as @name@ (<if @name@ not
- nil><a href="@home_url@">@name@'s
- @home_url_name@</a></if>) (<a href="/register/">change
- login</a>).
+ You are currently logged in as @user.first_names@ @user.last_name@.
</if>
<else>
<b>Log in</b> in the box on the right, using the email
address and password that you have just specified for the
administrator.
</else>
</p>
- <p>Here are the <b>packages currently available to you</b></p>
- <multiple name=nodes>
- <if @nodes.initial_install_p@ eq "t"> <h3> System Services </h3></if><else><h3>Installed Packages</h3></else>
- <ul>
- <group column="initial_install_p">
- <li><a href="@nodes.url@">@nodes.name@</a></li>
- </group>
- </ul>
- </multiple>
-
- <h3>Configure This Site</h3>
-
- <ul>
- <li>
- <b>Customize this page</b>. Edit the files
- <code>@acs_root_dir@/www/index.adp</code> and
- <code>@acs_root_dir@/www/index.tcl</code>. (<a
- href="/doc/templates.html">More information</a>)
- </li>
- <li>Change the site's overall appearance by <b>editing the master template</b> that wraps every page. The master template is <code>@acs_root_dir@/www/default-master.adp</code>. An ADP file is almost like HTML, except with a few extra bells
- and whistles (<a href="/doc/acs-templating/designer-guide.html"
- title="Templating Designer's Guide">more information</a>).</li>
- <li><a href="/admin/" title="Package and User
- administration">Site Administration</a>
- <ul>
- <li>Invite <a href="/acs-admin/users/">Users</a> or create <a href="/admin/groups/">Groups</a> (<a href="doc/permissions.html">More information</a>)</li>
- <li><b>Download contributed packages</b> at the <a href="http://openacs.org/software/"
- title="Software Page on openacs.org">OpenACS Software Page</a>.</li>
- <li><b>Install packages</b>. In addition to the Core packages,
- which are already installed, OpenACS ships with many Standard
- packages with additional functionality. Install these packages
- with the <a href="/acs-admin/apm/" title="OpenACS Package Manager on your server">Package Manager</a>.</li>
+ <if @sw_admin_p@ true>
+ <p>
+ </if>
- <li>Use the <a href="/admin/site-map/"
- title="The Site Map on your server">Site Map</a> to <b>mount and configure packages</b>. </li>
- </ul>
-</ul>
-
- <h3>Learn More</h3>
- <ul>
- <li>OpenACS <a href="/doc/" title="Documentation Home on your
- server"><b>Documentation</b></a> on this server.
- <li><a href="/api-doc/"
- title="API Documentation">API documentation</a>.
- </li>
- <li>The home of the <b>OpenACS community</b> is
- at <a href="http://openacs.org/"
- title="OpenACS Developer Community">http://openacs.org</a>.</li>
- <li>Visit the <a href="http://openacs.org/forums/"
- title="OpenACS Discussion Forums">discussion forums</a> on
- openacs.org, including the <a
- href="http://openacs.org/forums/forum-view?forum_id=14013"
- title="OpenACS discussion forum on openacs.org">OpenACS Q&A
- forum</a>.</li>
- <li>Post <b>bugs</b> and <b>feature requests</b> in the <a href="http://openacs.org/bugtracker/openacs/"
- title="Software Development Manager on openacs.org">Bug
- Tracker</a>.
- </li>
- <li>Please read our <a href="http://openacs.org/contribute">conbribution instructions</a> to learn how you can become involved in the OpenACS project.
- If you develop your own OpenACS packages there is a good chance they will be useful to other people in the community and after review they can be included in the OpenACS distribution.</li>
- </ul>
- </td>
- <td valign="top">
- <if @user_id@ gt 0>
- <!-- Already logged in -->
- </if>
- <else>
- <div id="login-box">
- <include src="/packages/acs-subsite/lib/login" return_url="/" username="@username@" authority_id="@authority_id@" &="__adp_properties">
- </div>
- </else>
-
- <p></p>
-
- <table bgcolor="#cccccc" cellpadding="0" cellspacing="0" border="0" align="right">
- <tr>
- <td>
- <table cellspacing="1" cellpadding="4" border="0">
- <tr bgcolor="#ccccff">
- <th>
- Quick Links
- </th>
- </tr>
- <tr bgcolor="#eeeeee">
- <td>
- <a href="http://openacs.org/">Developer Community</a>
- </td>
- </tr>
- <tr bgcolor="#eeeeee">
- <td>
- <a
- href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS Q&A forum</a>
- </td>
- </tr>
- <tr bgcolor="#eeeeee">
- <td>
- <a href="http://openacs.org/forums/">Other OpenACS forums</a>
- </td>
- </tr>
- <tr bgcolor="#eeeeee">
- <td>
- <a href="http://openacs.org/bugtracker/openacs/">Report a bug</a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
Index: openacs-4/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/www/index.tcl 18 Sep 2003 17:13:51 -0000 1.9
+++ openacs-4/www/index.tcl 21 Sep 2003 19:21:17 -0000 1.10
@@ -25,26 +25,17 @@
set user_id [ad_conn user_id]
+set sw_admin_p [acs_user::site_wide_admin_p]
+
db_multirow nodes site_nodes {}
if { $user_id != 0 } {
# The user is loged in.
- if {[db_0or1row user_name_select {
- select first_names || ' ' || last_name as name, email
- from persons, parties
- where person_id = :user_id
- and person_id = party_id
- }]} {
- set home_url [ad_pvt_home]
- set home_url_name [ad_pvt_home_name]
- }
- set requires_registration_p_clause ""
+ acs_user::get -array user
}
set system_name [ad_system_name]
set acs_version [ad_acs_version]
-set acs_root_dir [acs_root_dir]
-
set focus {}
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/www/site-master.adp 17 Sep 2003 12:13:10 -0000 1.2
+++ openacs-4/www/site-master.adp 21 Sep 2003 19:21:17 -0000 1.3
@@ -42,6 +42,10 @@
<span class="button-header"><a href="@admin_url@" title="Site-wide administration" class="button">Admin</a></span>
</if>
+ <if @admin_url@ not nil>
+
+ <span class="button-header"><a href="@devhome_url@" title="Developer's Administration" class="button">DevAdmin</a></span>
+ </if>
<if @pvt_home_url@ not nil>
<span class="button-header"><a href="@pvt_home_url@" title="Change password, email, portrait" class="button">@pvt_home_name@</a></span>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/www/site-master.tcl 18 Sep 2003 17:13:51 -0000 1.4
+++ openacs-4/www/site-master.tcl 21 Sep 2003 19:21:17 -0000 1.5
@@ -43,12 +43,11 @@
# Site-wide admin link
set admin_url {}
if { [ad_conn user_id] != 0 } {
- array set swadmin_node [site_node::get -url [apm_package_url_from_key "acs-admin"]]
- set swadmin_object_id $swadmin_node(object_id)
- set sw_admin_p [permission::permission_p -object_id $swadmin_object_id -privilege admin]
+ set sw_admin_p [acs_user::site_wide_admin_p]
if { $sw_admin_p } {
set admin_url "/acs-admin/"
- } elseif { [permission::permission_p -object_id [ad_conn subsite_id] -privilege admin] } {
+ set devhome_url "/acs-admin/developer"
+ } elseif { [permission::permission_p -object_id [subsite::get_element -element object_id] -privilege admin] } {
set admin_url "[subsite::get_element -element url]admin/"
}
}