[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.uifelamimail.inc.php templ...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.uifelamimail.inc.php templ... |
|
Date: |
Thu, 11 Oct 2007 13:31:05 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Dave Hall <skwashd> 07/10/11 13:31:05
Modified files:
inc : class.uifelamimail.inc.php
templates/base : mainscreen.tpl view_main.tpl view_message.tpl
Log message:
some clean ups
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifelamimail.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/mainscreen.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/view_main.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/view_message.tpl?cvsroot=phpgroupware&r1=1.4&r2=1.5
Patches:
Index: inc/class.uifelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.uifelamimail.inc.php 20 Feb 2007 10:27:37 -0000 1.14
+++ inc/class.uifelamimail.inc.php 11 Oct 2007 13:31:04 -0000 1.15
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifelamimail.inc.php,v 1.14 2007/02/20 10:27:37 sigurdne
Exp $ */
+ /* $Id: class.uifelamimail.inc.php,v 1.15 2007/10/11 13:31:04 skwashd
Exp $ */
class uifelamimail
{
@@ -35,76 +35,76 @@
{
global $phpgw, $phpgw_info;
- if(isset($GLOBALS['HTTP_POST_VARS']["mark_unread_x"]))
- $GLOBALS['HTTP_POST_VARS']["mark_unread"] =
"true";
- if(isset($GLOBALS['HTTP_POST_VARS']["mark_read_x"]))
- $GLOBALS['HTTP_POST_VARS']["mark_read"] =
"true";
-
if(isset($GLOBALS['HTTP_POST_VARS']["mark_unflagged_x"]))
- $GLOBALS['HTTP_POST_VARS']["mark_unflagged"] =
"true";
- if(isset($GLOBALS['HTTP_POST_VARS']["mark_flagged_x"]))
- $GLOBALS['HTTP_POST_VARS']["mark_flagged"] =
"true";
- if(isset($GLOBALS['HTTP_POST_VARS']["mark_deleted_x"]))
- $GLOBALS['HTTP_POST_VARS']["mark_deleted"] =
"true";
+ if(isset($_POST["mark_unread_x"]))
+ $_POST["mark_unread"] = "true";
+ if(isset($_POST["mark_read_x"]))
+ $_POST["mark_read"] = "true";
+ if(isset($_POST["mark_unflagged_x"]))
+ $_POST["mark_unflagged"] = "true";
+ if(isset($_POST["mark_flagged_x"]))
+ $_POST["mark_flagged"] = "true";
+ if(isset($_POST["mark_deleted_x"]))
+ $_POST["mark_deleted"] = "true";
$this->bofelamimail =
CreateObject('felamimail.bofelamimail');
$this->bofilter =
CreateObject('felamimail.bofilter');
- if(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
- $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
-
empty($GLOBALS['HTTP_POST_VARS']["mark_unread"]) &&
- empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
&&
-
empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
-
empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
-
empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
+ if(isset($_POST["mailbox"]) &&
+ $_GET["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
+ empty($_POST["mark_unread"]) &&
+ empty($_POST["mark_read"]) &&
+ empty($_POST["mark_unflagged"]) &&
+ empty($_POST["mark_flagged"]) &&
+ empty($_POST["mark_deleted"]))
{
- if ($GLOBALS['HTTP_POST_VARS']["folderAction"]
== "changeFolder")
+ if ($_POST["folderAction"] == "changeFolder")
{
// change folder
-
$this->bofelamimail->sessionData['mailbox'] =
$GLOBALS['HTTP_POST_VARS']["mailbox"];
+
$this->bofelamimail->sessionData['mailbox'] = $_POST["mailbox"];
$this->bofelamimail->sessionData['startMessage']= 1;
$this->bofelamimail->sessionData['sort'] = 6;
$this->bofelamimail->sessionData['activeFilter']= -1;
}
-
elseif($GLOBALS['HTTP_POST_VARS']["folderAction"] == "moveMessage")
+ elseif($_POST["folderAction"] == "moveMessage")
{
//print "move messages<br>";
-
$this->bofelamimail->sessionData['mailbox'] =
urldecode($GLOBALS['HTTP_POST_VARS']["oldMailbox"]);
+
$this->bofelamimail->sessionData['mailbox'] =
urldecode($_POST["oldMailbox"]);
$this->bofelamimail->sessionData['startMessage']= 1;
- if
(is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
+ if (is_array($_POST["msg"]))
{
// we need to initialize the
classes first
$this->moveNeeded = "1";
}
}
}
- elseif(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
- $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
-
!empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
+ elseif(isset($_POST["mailbox"]) &&
+ $_GET["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
+ !empty($_POST["mark_deleted"]))
{
// delete messages
$this->bofelamimail->sessionData['startMessage']= 1;
}
- elseif(isset($GLOBALS['HTTP_GET_VARS']["menuaction"])
&& $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.deleteMessage")
+ elseif(isset($_GET["menuaction"]) &&
$_GET["menuaction"] == "felamimail.uifelamimail.deleteMessage")
{
// delete 1 message from the mail reading window
$this->bofelamimail->sessionData['startMessage']= 1;
}
- elseif(isset($GLOBALS['HTTP_POST_VARS']["filter"]) ||
isset($GLOBALS['HTTP_GET_VARS']["filter"]))
+ elseif(isset($_POST["filter"]) ||
isset($_GET["filter"]))
{
// new search filter defined, lets start with
message 1
$this->bofelamimail->sessionData['startMessage']= 1;
}
// navigate for and back
- if(isset($GLOBALS['HTTP_GET_VARS']["startMessage"]))
+ if(isset($_GET["startMessage"]))
{
-
$this->bofelamimail->sessionData['startMessage'] =
$GLOBALS['HTTP_GET_VARS']["startMessage"];
+
$this->bofelamimail->sessionData['startMessage'] = $_GET["startMessage"];
}
// change sorting
- if(isset($GLOBALS['HTTP_GET_VARS']["sort"]))
+ if(isset($_GET["sort"]))
{
- $this->bofelamimail->sessionData['sort'] =
$GLOBALS['HTTP_GET_VARS']["sort"];
+ $this->bofelamimail->sessionData['sort'] =
$_GET["sort"];
}
$this->bofelamimail->saveSessionData();
@@ -131,8 +131,8 @@
function addVcard()
{
- $messageID =
$GLOBALS['HTTP_GET_VARS']['messageID'];
- $partID = $GLOBALS['HTTP_GET_VARS']['partID'];
+ $messageID = $_GET['messageID'];
+ $partID = $_GET['partID'];
$attachment =
$this->bofelamimail->getAttachment($messageID,$partID);
$tmpfname = tempnam
($GLOBALS['phpgw_info']['server']['temp_dir'], "phpgw_");
@@ -163,15 +163,15 @@
function changeFilter()
{
- if(isset($GLOBALS['HTTP_POST_VARS']["filter"]))
+ if(isset($_POST["filter"]))
{
- $data['quickSearch'] =
$GLOBALS['HTTP_POST_VARS']["quickSearch"];
- $data['filter'] =
$GLOBALS['HTTP_POST_VARS']["filter"];
+ $data['quickSearch'] = $_POST["quickSearch"];
+ $data['filter'] = $_POST["filter"];
$this->bofilter->updateFilter($data);
}
- elseif(isset($GLOBALS['HTTP_GET_VARS']["filter"]))
+ elseif(isset($_GET["filter"]))
{
- $data['filter'] =
$GLOBALS['HTTP_GET_VARS']["filter"];
+ $data['filter'] = $_GET["filter"];
$this->bofilter->updateFilter($data);
}
$this->viewMainScreen();
@@ -185,7 +185,7 @@
function deleteMessage()
{
- $message[] = $GLOBALS['HTTP_GET_VARS']["message"];
+ $message[] = $_GET["message"];
$this->bofelamimail->deleteMessages($message);
@@ -205,43 +205,43 @@
{
if($this->moveNeeded == "1")
{
-
$this->bofelamimail->moveMessages($GLOBALS['HTTP_POST_VARS']["mailbox"],
-
$GLOBALS['HTTP_POST_VARS']["msg"]);
+
$this->bofelamimail->moveMessages($_POST["mailbox"],
+
$_POST["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"])
- && isset($GLOBALS['HTTP_POST_VARS']["msg"])
- && is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
+ elseif(!empty($_POST["mark_deleted"])
+ && isset($_POST["msg"])
+ && is_array($_POST["msg"]))
{
-
$this->bofelamimail->deleteMessages($GLOBALS['HTTP_POST_VARS']["msg"]);
+
$this->bofelamimail->deleteMessages($_POST["msg"]);
}
- elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_unread"])
- && isset($GLOBALS['HTTP_POST_VARS']["msg"])
- && is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
+ elseif(!empty($_POST["mark_unread"])
+ && isset($_POST["msg"])
+ && is_array($_POST["msg"]))
{
-
$this->bofelamimail->flagMessages("unread",$GLOBALS['HTTP_POST_VARS']["msg"]);
+
$this->bofelamimail->flagMessages("unread",$_POST["msg"]);
}
- elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
- && isset($GLOBALS['HTTP_POST_VARS']["msg"])
- && is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
+ elseif(!empty($_POST["mark_read"])
+ && isset($_POST["msg"])
+ && is_array($_POST["msg"]))
{
-
$this->bofelamimail->flagMessages("read",$GLOBALS['HTTP_POST_VARS']["msg"]);
+
$this->bofelamimail->flagMessages("read",$_POST["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"])
- && isset($GLOBALS['HTTP_POST_VARS']["msg"])
- && is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
+ elseif(!empty($_POST["mark_unflagged"])
+ && isset($_POST["msg"])
+ && is_array($_POST["msg"]))
{
-
$this->bofelamimail->flagMessages("unflagged",$GLOBALS['HTTP_POST_VARS']["msg"]);
+
$this->bofelamimail->flagMessages("unflagged",$_POST["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"])
- && isset($GLOBALS['HTTP_POST_VARS']["msg"])
- && is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
+ elseif(!empty($_POST["mark_flagged"])
+ && isset($_POST["msg"])
+ && is_array($_POST["msg"]))
{
-
$this->bofelamimail->flagMessages("flagged",$GLOBALS['HTTP_POST_VARS']["msg"]);
+
$this->bofelamimail->flagMessages("flagged",$_POST["msg"]);
}
@@ -349,7 +349,7 @@
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen'
);
-
$this->t->set_var('refresh_url',$GLOBALS['phpgw']->link('/index.php',$linkData));
+ $this->t->set_var('refresh_url',
$GLOBALS['phpgw']->link('/index.php',$linkData));
// set the default values for the sort links (sort by
url)
@@ -357,7 +357,7 @@
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
'startMessage' => 1,
- 'sort' => "2"
+ 'sort' => 2
);
$this->t->set_var('url_sort_from',$GLOBALS['phpgw']->link('/index.php',$linkData));
@@ -366,7 +366,7 @@
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
'startMessage' => 1,
- 'sort' => "0"
+ 'sort' => 0
);
$this->t->set_var('url_sort_date',$GLOBALS['phpgw']->link('/index.php',$linkData));
@@ -375,19 +375,25 @@
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
'startMessage' => 1,
- 'sort' => "4"
+ 'sort' => 4
);
$this->t->set_var('url_sort_subject',$GLOBALS['phpgw']->link('/index.php',$linkData));
// create the filter ui
$filterList = $bofilter->getFilterList();
$activeFilter = $bofilter->getActiveFilter();
+
$filterUI = '';
// -1 == no filter selected
if($activeFilter == -1)
- $filterUI .= "<option value=\"-1\"
selected>".lang('no filter')."</option>";
+ {
+ $filterUI .= '<option value="-1" selected>' .
lang('no filter') . '</option>';
+ }
else
- $filterUI .= "<option value=\"-1\">".lang('no
filter')."</option>";
+ {
+ $filterUI .= '<option value="-1">' . lang('no
filter') . '</option>';
+ }
+
while(list($key,$value) = @each($filterList))
{
$selected="";
@@ -400,37 +406,36 @@
$this->t->set_var('quicksearch',(isset($filterList[0]['subject'])?$filterList[0]['subject']:''));
// create the urls for sorting
- switch($this->sort)
+ switch((int) $this->sort)
{
- case "0":
+ case 2:
$linkData = array
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
'startMessage' => 1,
- 'sort' => "1"
+ 'sort' => 3
);
-
$this->t->set_var('url_sort_date',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
+ $this->t->set_var('url_sort_from',
$GLOBALS['phpgw']->link('/index.php',$linkData));
break;
- case "2":
+
+ case 4:
$linkData = array
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
'startMessage' => 1,
- 'sort' => "3"
+ 'sort' => 5
);
-
$this->t->set_var('url_sort_from',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
+ $this->t->set_var('url_sort_subject',
$GLOBALS['phpgw']->link('/index.php',$linkData));
break;
- case "4":
+
+ case 0:
$linkData = array
(
'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
'startMessage' => 1,
- 'sort' => "5"
+ 'sort' => 1
);
-
$this->t->set_var('url_sort_subject',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
+ $this->t->set_var('url_sort_date',
$GLOBALS['phpgw']->link('/index.php',$linkData));
break;
}
@@ -448,9 +453,10 @@
// create the listing of subjects
$maxSubjectLength = 75;
$maxAddressLength = 30;
- for($i=0; $i<count($headers['header']); $i++)
+ $cnt_headers = count($headers['header']);
+ for($i=0; $i < $cnt_headers; ++$i)
{
- if
(!empty($headers['header'][$i]['subject']))
+ if
(!empty($headers['header'][$i]['sender_name']))
{
$headers['header'][$i]['sender_name'] =
htmlentities($headers['header'][$i]['sender_name'],ENT_COMPAT,'UTF-8');
}
@@ -499,11 +505,8 @@
if
(!empty($headers['header'][$i]['sender_name']))
{
$sender_name =
$headers['header'][$i]['sender_name'];
- $full_address =
-
$headers['header'][$i]['sender_name'].
- " <".
-
$headers['header'][$i]['sender_address'].
- ">";
+ $full_address =
"{$headers['header'][$i]['sender_name']}"
+ .
"<{$headers['header'][$i]['sender_address']}>";
}
else
{
@@ -519,7 +522,7 @@
$this->t->set_var('sender_name',$sender_name);
$this->t->set_var('full_address',$full_address);
-
if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
+ if(isset($_GET["select_all"]) &&
$_GET["select_all"] == "select_all")
{
$this->t->set_var('row_selected',"checked");
}
@@ -528,13 +531,34 @@
$this->t->set_var('message_uid',$headers['header'][$i]['uid']);
$this->t->set_var('date',$headers['header'][$i]['date']);
$this->t->set_var('size',$this->show_readable_size($headers['header'][$i]['size']));
- $flags = "";
-
if(!empty($headers['header'][$i]['recent'])) $flags .= "R";
-
if(!empty($headers['header'][$i]['flagged'])) $flags .= "F";
-
if(!empty($headers['header'][$i]['answered'])) $flags .= "A";
-
if(!empty($headers['header'][$i]['deleted'])) $flags .= "D";
-
if(!empty($headers['header'][$i]['seen'])) $flags .= "S";
- #$this->t->set_var('flags',$flags);
+
+ $flags = '';
+
if(!empty($headers['header'][$i]['recent']))
+ {
+ $flags .= "R";
+ }
+
+
if(!empty($headers['header'][$i]['flagged']))
+ {
+ $flags .= "F";
+ }
+
+
if(!empty($headers['header'][$i]['answered']))
+ {
+ $flags .= "A";
+ }
+
+
if(!empty($headers['header'][$i]['deleted']))
+ {
+ $flags .= "D";
+ }
+
+
if(!empty($headers['header'][$i]['seen']))
+ {
+ $flags .= "S";
+ }
+
+ $this->t->set_var('flags',$flags);
# $linkData = array
# (
@@ -570,10 +594,10 @@
$this->t->set_var('url_add_to_addressbook',$GLOBALS['phpgw']->link('/index.php',$linkData));
$this->t->set_var('phpgw_images',PHPGW_IMAGES);
-
$this->t->set_var('row_css_class','header_row_'.$flags);
+ $this->t->set_var('row_css_class', ($i
% 2 ? 'row_on' : 'row_off') . " header_row_{$flags}");
switch($flags)
{
- case "":
+ case '':
$this->t->set_var('imageName','unread_small.png');
$this->t->set_var('row_text',lang('new'));
break;
@@ -624,7 +648,7 @@
$this->t->set_var('maxMessages',isset($i)?$i:0);
//Fix this: move into next if-block
- if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
+ if(isset($_GET["select_all"]) && $_GET["select_all"] ==
"select_all")
{
$this->t->set_var('checkedCounter',$i);
}
@@ -634,7 +658,7 @@
}
// set the select all/nothing link
- if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
+ if(isset($_GET["select_all"]) && $_GET["select_all"] ==
"select_all")
{
// link to unselect all messages
$linkData = array
@@ -816,9 +840,6 @@
{
global $phpgw_info;
- $this->t->set_var('bg_01',$phpgw_info["theme"]["bg01"]);
- $this->t->set_var('bg_02',$phpgw_info["theme"]["bg02"]);
-
$this->t->set_var('lang_compose',lang('compose'));
$this->t->set_var('lang_edit_filter',lang('edit
filter'));
$this->t->set_var('lang_move_selected_to',lang('move
selected to'));
Index: templates/base/mainscreen.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/mainscreen.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/mainscreen.tpl 18 Dec 2006 20:03:33 -0000 1.2
+++ templates/base/mainscreen.tpl 11 Oct 2007 13:31:04 -0000 1.3
@@ -1,37 +1,13 @@
<!-- BEGIN main -->
-<script language="JavaScript1.2">
-<!--
-var sURL = unescape(window.location.pathname);
-
-function doLoad()
-{
- // the timeout value should be the same as in the "refresh" meta-tag
- {refreshTime}
-}
-
-function refresh()
-{
- var Ziel = '{refresh_url}'
- window.location.href = Ziel;
-}
-
-doLoad();
-
-//-->
-</script>
-<STYLE type="text/css">
+<style type="text/css">
.header_row_, A.header_row_
{
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
font-weight : bold;
}
.header_row_D, A.header_row_D
{
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
color: silver;
text-decoration : line-through;
@@ -40,8 +16,6 @@
.header_row_DS, A.header_row_DS, .header_row_ADS, A.header_row_ADS
{
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
color: silver;
text-decoration : line-through;
@@ -49,16 +23,12 @@
.header_row_S, A.header_row_S
{
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
vertical-align : middle;
}
.header_row_AS, A.header_row_AS
{
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
vertical-align : middle;
}
@@ -66,8 +36,6 @@
.header_row_FAS, A.header_row_FAS, .header_row_FS, A.header_row_FS
{
color: red;
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
vertical-align : middle;
}
@@ -75,8 +43,6 @@
.header_row_F, A.header_row_F
{
color: red;
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
font-weight : bold;
vertical-align : middle;
@@ -84,18 +50,17 @@
.header_row_R, A.header_row_R
{
- FONT-SIZE: 12px;
- height : 12px;
padding: 0;
font-weight : bold;
vertical-align : middle;
}
-</STYLE>
+</style>
<script type="text/javascript">
<!--
- var checkedCounter={checkedCounter}, aktiv;
+ var checkedCounter={checkedCounter};
+ var active;
var maxMessages = {maxMessages};
function ttoggleFolderRadio()
@@ -106,10 +71,10 @@
function toggleFolderRadio(_counter)
{
- if(aktiv)
+ if(active)
{
// do not reload, while we try to select some messages
- window.clearTimeout(aktiv);
+ window.clearTimeout(active);
{refreshTime}
}
@@ -138,11 +103,27 @@
}
}
+ var sURL = unescape(window.location.pathname);
+
+ function doLoad()
+ {
+ // the timeout value should be the same as in the "refresh"
meta-tag
+ {refreshTime}
+ }
+
+ function refresh()
+ {
+ window.location.href = '{refresh_url}';
+ }
+
+ doLoad();
+
//-->
</script>
-<TABLE BORDER="0" WIDTH="100%" CELLSPACING=0 CELLPADDING=2>
- <TR BGCOLOR="{row_off}">
- <TD ALIGN="left" WIDTH="70%">
+
+<table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr class="row_off">
+ <td ALIGN="left" WIDTH="70%">
<a
href="{url_compose_empty}">{lang_compose}</a>
<a
href="{url_filter}">{lang_edit_filter}</a>
</td>
@@ -150,7 +131,7 @@
{quota_display}
</td>
</tr>
- <TR valign="middle">
+ <tr valign="middle">
<form name=searchForm method=post
action="{url_search_settings}">
<td colspan="1" bgcolor="#ffffcc" align="left" width="70%">
{lang_quicksearch}:
@@ -169,8 +150,8 @@
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<TR>
- <TD BGCOLOR="{row_off}">
- <TABLE BGCOLOR="{row_off}" COLS=2 BORDER='0'
cellpadding=0 cellspacing=0 width="100%">
+ <TD class="row_off">
+ <TABLE class="row_off" COLS=2 BORDER='0' cellpadding=0
cellspacing=0 width="100%">
<TR valign="middle">
<FORM name=messageList method=post
action="{url_change_folder}">
<td nowrap width="40%" align="LEFT"
valign="center" bgcolor="#ffffcc">
@@ -246,7 +227,7 @@
</td>
<td bgcolor="#FFFFCC" align="center">
- <b><a
href="{url_sort_subject}"><font color="black">{lang_subject}</font></a
+ <b><a
href="{url_sort_subject}"><font color="black">{lang_subject}</font></a>
</td>
<td bgcolor="#FFFFCC" align="center">
<b>{lang_size}</b>
@@ -290,11 +271,10 @@
<!-- BEGIN header_row -->
<tr class="{row_css_class}">
<td width="1%" bgcolor="#FFFFFF" align="center">
- <iinput type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- <input class="{row_css_class}" type="checkbox"
id="msg_input_{message_counter}" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio('{message_counter}')"
{row_selected}>
+ <input type="checkbox" id="msg_input_{message_counter}"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio('{message_counter}')" {row_selected}>
</td>
<td width="10%" bgcolor="#FFFFFF" nowrap>
- <a class="{row_css_class}" href="{url_compose}"
title="{full_address}">{sender_name}</a>
+ <a href="{url_compose}" title="{full_address}">{sender_name}</a>
<a href="{url_add_to_addressbook}"><img src="{sm_envelope}"
width="10" height="8" border="0" align="absmiddle"
alt="{lang_add_to_addressbook}" title="{lang_add_to_addressbook}"></a>
</td>
<td bgcolor="#FFFFFF" nowrap align="center">
@@ -306,7 +286,7 @@
--> {row_text}
</td>
<td bgcolor="#FFFFFF">
- <a class="{row_css_class}" name="subject_url"
href="{url_read_message}">{header_subject}</a>
+ <a name="subject_url"
href="{url_read_message}">{header_subject}</a>
</td>
<td bgcolor="#FFFFFF">
{size}
@@ -317,7 +297,7 @@
<!-- BEGIN error_message -->
<tr>
<td bgcolor="#FFFFCC" align="center" colspan="6">
- <font
color="red"><b>{lang_connection_failed}</b></font><br>
+ <span class="error">{lang_connection_failed}</span><br>
{message}
</td>
</tr>
Index: templates/base/view_main.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/view_main.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/view_main.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/view_main.tpl 11 Oct 2007 13:31:04 -0000 1.2
@@ -1,6 +1,6 @@
<!-- BEGIN main_navbar -->
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">
- <TR BGCOLOR="{row_on}">
+ <TR class="row_on">
<TD>
<table width="100%" cellpadding="0" cellspacing="0"
border="0">
<tr>
@@ -22,8 +22,8 @@
</tr>
<FORM name=messageList method=post action="{moveURL}">
<TR>
- <TD BGCOLOR="{row_off}">
- <TABLE BGCOLOR="{row_off}" COLS=2 BORDER=0
cellpadding=0 cellspacing=0 width=100%>
+ <TD class="row_off">
+ <TABLE class="row_off" COLS=2 BORDER=0 cellpadding=0
cellspacing=0 width=100%>
<TR>
<TD WIDTH=40% ALIGN=LEFT VALIGN=CENTER>
<TT><SMALL>
Index: templates/base/view_message.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/view_message.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- templates/base/view_message.tpl 22 Dec 2006 10:36:52 -0000 1.4
+++ templates/base/view_message.tpl 11 Oct 2007 13:31:04 -0000 1.5
@@ -120,7 +120,7 @@
<tr>
<td valign="top" bgcolor={bg01}>
<a href="{link_view}" target="_blank"><font size="2"
face="{theme_font}">
- <b>{filename}</b></font><a>
+ <b>{filename}</b></font></a>
</td>
<td colspan="2" bgcolor={bg01}>
<font size="2" face="{theme_font}">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] felamimail inc/class.uifelamimail.inc.php templ...,
Dave Hall <=