Package: webcalendar
Version: 0.9.45-2
Severity: wishlist
The public access (non-logged-in) calendar display prominently displays
things like "User: Public Access" in various places, which is confusing
to the people looking at that calendar since they don't necessary even
know (or care) about the concept of users for the calendar.
I've made some changes to remove these extraneous displays, for the
most part just making the public access calendar look more like the
single-user calendar, as shown in the following patch:
diff -ur webcalendar-0.9.45-2/day.php webcalendar/day.php
--- webcalendar-0.9.45-2/day.php 2004-11-04 16:39:06.000000000 -0500
+++ webcalendar/day.php 2005-02-04 14:28:09.000000000 -0500
@@ -65,7 +65,7 @@
?></span>
<span class="user"><?php
// display current calendar's user (if not in single user)
- if ( $single_user == "N" ) {
+ if ( $single_user == "N" and $public_access == "N" ) {
echo "<br />";
echo $user_fullname;
}
diff -ur webcalendar-0.9.45-2/includes/trailer.php
webcalendar/includes/trailer.php
--- webcalendar-0.9.45-2/includes/trailer.php 2004-12-13 19:09:48.000000000
-0500
+++ webcalendar/includes/trailer.php 2005-01-28 11:01:27.000000000 -0500
@@ -315,11 +314,9 @@
translate("Logout") . "\" href=\"$login_url\">" .
translate("Logout") . "</a>)<br />\n";
} else {
- echo "<span class=\"prefix\">" .
- translate("Current User") . ":</span> " .
- translate("Public Access") . " (<a title=\"" .
+ echo "<small>(<a title=\"" .
translate("Login") . "\" href=\"$login_url\">" .
- translate("Login") . "</a>)<br />\n";
+ translate("Login") . "</a>)</small><br />\n";
}
}
if ($nonuser_enabled == "Y" ) $admincals = get_nonuser_cals ($login);
diff -ur webcalendar-0.9.45-2/month.php webcalendar/month.php
--- webcalendar-0.9.45-2/month.php 2004-12-04 00:31:33.000000000 -0500
+++ webcalendar/month.php 2005-01-17 15:00:27.000000000 -0500
@@ -54,7 +54,7 @@
$DATE_FORMAT_MY, false, false );
?></span>
<span class="user"><?php
- if ( $single_user == "N" ) {
+ if ( $single_user == "N" and $public_access == "N" ) {
echo "<br />\n";
echo $user_fullname;
}
diff -ur webcalendar-0.9.45-2/week.php webcalendar/week.php
--- webcalendar-0.9.45-2/week.php 2004-12-05 08:18:27.000000000 -0500
+++ webcalendar/week.php 2005-01-17 15:14:32.000000000 -0500
@@ -79,7 +79,7 @@
<a title="<?php etranslate("Next")?>" class="next" href="week.php?<?php echo
$u_url;?>date=<?php echo date ("Ymd", $next ) . $caturl;?>"><img
src="rightarrow.gif" alt="<?php etranslate("Next")?>" /></a>
<span class="user"><?php
- if ( $single_user == "N" ) {
+ if ( $single_user == "N" and $public_access == "N" ) {
echo "<br />$user_fullname";
}
if ( $is_nonuser_admin )
diff -ur webcalendar-0.9.45-2/week_details.php webcalendar/week_details.php
--- webcalendar-0.9.45-2/week_details.php 2004-12-07 19:24:15.000000000
-0500
+++ webcalendar/week_details.php 2005-01-17 15:15:12.000000000 -0500
@@ -75,7 +75,7 @@
}
?>
<span class="user"><?php
- if ( $single_user == "N" ) {
+ if ( $single_user == "N" and $public_access == "N" ) {
echo "<br />$user_fullname\n";
}
if ( $is_nonuser_admin )
diff -ur webcalendar-0.9.45-2/year.php webcalendar/year.php
--- webcalendar-0.9.45-2/year.php 2004-11-21 20:24:20.000000000 -0500
+++ webcalendar/year.php 2005-01-17 15:15:40.000000000 -0500
@@ -49,7 +49,7 @@
<a title="<?php etranslate("Next")?>" class="next"
href="year.php?year=<?php echo $nextYear; if ( ! empty ( $user ) ) echo
"&user=$user";?>"><img src="rightarrow.gif" alt="<?php
etranslate("Next")?>" /></a>
<span class="date"><?php echo $thisyear ?></span>
<span class="user"><?php
- if ( $single_user == "N" ) {
+ if ( $single_user == "N" and $public_access == "N" ) {
echo "<br />\n";
if ( ! empty ( $user ) ) {
user_load_variables ( $user, "user_" );
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing'), (50, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.7-1-686-smp
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages webcalendar depends on:
ii apache [httpd] 1.3.33-3 versatile, high-performance HTTP s
ii debconf [debconf-2.0] 1.4.30.11 Debian configuration management sy
ii mysql-server 4.0.23-3 mysql database server binaries
ii php4 4:4.3.10-2 server-side, HTML-embedded scripti
ii php4-cli 4:4.3.10-2 command-line interpreter for the p
ii php4-mysql 4:4.3.10-2 MySQL module for php4
-- debconf information:
webcalendar/conf/single_user_mode: false
webcalendar/conf/db_host: localhost
webcalendar/conf/db_database:
webcalendar/note/sql_install:
webcalendar/conf/db_type: mysql
webcalendar/status/db_installed: false
webcalendar/note/admin_user:
webcalendar/conf/db_login:
webcalendar/conf/db_persistent: true
webcalendar/conf/single_user_login:
webcalendar/conf/db_password:
webcalendar/conf/use_http_auth: false
* webcalendar/status/debconf_managed: false
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
