Commit 33e6b78c authored by Jesse Vincent's avatar Jesse Vincent
Browse files

Updates from Gugod

 r15592@kybristedi:  gugod | 2005-03-31 18:20:07 +0800
 make local branch again
 r15850@kybristedi:  gugod | 2005-04-02 15:26:27 +0800
indentation of some mess body :/
Tweak on the div.title and div.mainbody
 r15851@kybristedi:  gugod | 2005-04-02 16:10:59 +0800
 Make platano "HOME" screen has the same layout as 3.4R
 r15856@kybristedi:  gugod | 2005-04-02 17:39:59 +0800
 remove <font> tag
 r15857@kybristedi:  gugod | 2005-04-02 17:40:48 +0800
 TitleBox now use <div> instead of <table>
 r15858@kybristedi:  gugod | 2005-04-02 18:28:09 +0800
wrap a div#all right inside <body> to avoid margin problem on IE
use div.right-column and div.left-column to split columns.
 r16237@kybristedi:  gugod | 2005-04-08 12:27:57 +0800
 setup login form semantic
 r16238@kybristedi:  gugod | 2005-04-08 12:39:25 +0800
 So, semantics.
 r16239@kybristedi:  gugod | 2005-04-08 12:41:51 +0800
 tweak css to match semantic of "HOME" page
 r16240@kybristedi:  gugod | 2005-04-08 12:45:55 +0800
 put ossf new style into css linkn
 r16298@kybristedi:  gugod | 2005-04-10 09:37:10 +0800
 Move TitleBox to Widgets/
 r16299@kybristedi:  gugod | 2005-04-10 09:53:44 +0800
 /Elements/TitleBox -> /Widgets/TitleBox
 r16300@kybristedi:  gugod | 2005-04-10 09:55:50 +0800
 /Elements/TitleBox -> /Widgets/TitleBox

git-svn-id: svn+ssh://svn.bestpractical.com/svn/bps-public/rt/branches/PLATANO-EXPERIMENTAL-CSS@2599 e417ac7c-1bcc-0310-8ffa-8f5827389a85
parent fff236df
......@@ -49,7 +49,7 @@
<FORM METHOD=POST ACTION="Scrip.html">
<input type="hidden" name="id" value="<%$id%>">
<input type="hidden" name="Queue" value="<%$Queue%>">
<& /Elements/TitleBoxStart, title => loc('Scrip Fields') &>
<& /Widgets/TitleBoxStart, title => loc('Scrip Fields') &>
<TABLE>
<TR>
<TD ALIGN=RIGHT>
......@@ -91,11 +91,11 @@
</TD>
</TR>
</table>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
<br>
<& /Elements/TitleBoxStart, title => loc('User Defined conditions and actions') &>
<& /Widgets/TitleBoxStart, title => loc('User Defined conditions and actions') &>
<table>
<TR>
<TD colspan=2>
......@@ -127,7 +127,7 @@
</TD>
</TR>
</table>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
......
......@@ -51,7 +51,7 @@
<FORM METHOD=POST ACTION="GroupRights.html">
<& /Elements/TitleBoxStart, title => loc('Modify global group rights.')&>
<& /Widgets/TitleBoxStart, title => loc('Modify global group rights.')&>
<h1><&|/l&>System groups</&></h1>
<TABLE>
......@@ -102,7 +102,7 @@
% }
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
</FORM>
......
......@@ -51,7 +51,7 @@
<FORM METHOD=POST ACTION="UserRights.html">
<& /Elements/TitleBoxStart, title => loc('Modify global user rights.') &>
<& /Widgets/TitleBoxStart, title => loc('Modify global user rights.') &>
<TABLE>
......@@ -71,7 +71,7 @@
% }
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
</FORM>
......
......@@ -53,7 +53,7 @@
<FORM METHOD=POST ACTION="GroupRights.html">
<INPUT TYPE=HIDDEN NAME=id VALUE="<% $GroupObj->id %>">
<& /Elements/TitleBoxStart, title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
<& /Widgets/TitleBoxStart, title => loc('Modify group rights for group [_1]', $GroupObj->Name) &>
<h1><&|/l&>System groups</&></h1>
<TABLE>
......@@ -90,7 +90,7 @@
% }
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
</FORM>
......
......@@ -50,7 +50,7 @@
<& /Elements/ListActions, actions => \@results &>
<& /Elements/TitleBoxStart, title => loc('Editing membership for group [_1]', $Group->Name) &>
<& /Widgets/TitleBoxStart, title => loc('Editing membership for group [_1]', $Group->Name) &>
<FORM ACTION="<%$RT::WebPath%>/Admin/Groups/Members.html" METHOD=POST>
<INPUT TYPE=HIDDEN NAME=id VALUE="<%$Group->Id%>">
......@@ -98,7 +98,7 @@
</TD>
</TR>
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Label => loc('Modify Members'), Reset => 1 &>
</form>
......
......@@ -53,7 +53,7 @@
<FORM METHOD=POST ACTION="UserRights.html">
<INPUT TYPE=HIDDEN NAME=id VALUE="<% $GroupObj->id %>">
<& /Elements/TitleBoxStart, title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
<& /Widgets/TitleBoxStart, title => loc('Modify user rights for group [_1]', $GroupObj->Name) &>
<TABLE>
......@@ -72,7 +72,7 @@
% }
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
</FORM>
......
......@@ -62,7 +62,7 @@
<TR>
<TD VALIGN=TOP class="boxcontainer">
<& /Elements/TitleBoxStart, title => loc('Identity') &>
<& /Widgets/TitleBoxStart, title => loc('Identity') &>
<TABLE>
<TR><TD ALIGN="RIGHT">
......@@ -101,9 +101,9 @@
<textarea name="FreeformContactInfo" cols=20 rows=5><%$UserObj->FreeformContactInfo%></TEXTAREA>
</TD></TR>
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<br>
<& /Elements/TitleBoxStart, title => loc('Access control') &>
<& /Widgets/TitleBoxStart, title => loc('Access control') &>
<INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>>
<&|/l&>Let this user access RT</&><BR>
......@@ -131,11 +131,11 @@
</TR>
</TABLE>
% }
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
</TD>
<TD VALIGN=TOP class="boxcontainer">
<& /Elements/TitleBoxStart, title => loc('Location') &>
<& /Widgets/TitleBoxStart, title => loc('Location') &>
<TABLE>
<TR><TD ALIGN="RIGHT">
<&|/l&>Organization</&>:
......@@ -175,9 +175,9 @@
<input name="Country" value="<%$UserObj->Country%>">
</TD></TR>
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<br>
<& /Elements/TitleBoxStart, title => loc('Phone numbers') &>
<& /Widgets/TitleBoxStart, title => loc('Phone numbers') &>
<TABLE>
<TR><TD ALIGN="RIGHT">
<&|/l&>Residence</&>:
......@@ -198,14 +198,14 @@
<&|/l&>Pager</&>:
</TD><TD>
<input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13><br>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
</TD>
<TR>
</TR>
</TABLE>
<BR>
<& /Elements/TitleBoxStart, title => loc('Custom Fields') &>
<& /Widgets/TitleBoxStart, title => loc('Custom Fields') &>
<TABLE>
% my $CFs = $UserObj->CustomFields;
% while (my $CF = $CFs->Next) {
......@@ -218,17 +218,17 @@
<TR>
</TR>
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<TR>
<TD colspan="2">
<& /Elements/TitleBoxStart, title => loc('Comments about this user') &>
<& /Widgets/TitleBoxStart, title => loc('Comments about this user') &>
<TEXTAREA class="comments" name="Comments" COLS=80 ROWS=5 WRAP=VIRTUAL><%$UserObj->Comments%></TEXTAREA>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
%if ($UserObj->Privileged) {
<BR>
<& /Elements/TitleBoxStart, title => loc('Signature') &>
<& /Widgets/TitleBoxStart, title => loc('Signature') &>
<TEXTAREA class="signature" COLS=80 ROWS=5 name="Signature" WRAP=HARD><%$UserObj->Signature%></TEXTAREA>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
% }
</TD>
......
......@@ -50,13 +50,13 @@
Title => $title &>
<form method=post action="<%$RT::WebPath%>/Approvals/index.html">
<& /Elements/TitleBoxStart, title => $title &>
<& /Widgets/TitleBoxStart, title => $title &>
<& /Ticket/Elements/ShowHistory , Ticket => $Ticket, Collapsed => 0, ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0 &>
<hr>
<table width=100%>
<& Elements/Approve, ticket => $Ticket, ShowApproving => 0 &>
</table>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<& /Elements/Submit&>
</form>
<& Elements/ShowDependency, Ticket => $Ticket &>
......
......@@ -57,7 +57,7 @@
% }
</table>
<& /Elements/TitleBoxStart, title => loc("Search for approvals") &>
<& /Widgets/TitleBoxStart, title => loc("Search for approvals") &>
<input type=checkbox value="1" name="ShowPending"
<%((!$ARGS{'ShowRejected'} && !$ARGS{'ShowResolved'}) ||
$ARGS{'ShowPending'})
......@@ -69,7 +69,7 @@
<&|/l,"<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>"&>Only show approvals for requests created before [_1]</&><br>
<&|/l, "<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>"&>Only show approvals for requests created after [_1]</&>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<%init>
my $tickets = RT::Tickets->new( $session{'CurrentUser'} );
......
......@@ -60,22 +60,22 @@ while (my $link = $approving->Next()) {
my $dep = $m->scomp('ShowDependency', Ticket => $link->BaseObj, _seen => $_seen);
if ($type eq 'approval') {
$head .= $m->scomp('/Elements/TitleBoxStart', title => loc("Approval #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
$head .= $m->scomp('/Widgets/TitleBoxStart', title => loc("Approval #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
$text .= $head;
$text .= $m->scomp('/Ticket/Elements/ShowCustomFields', Ticket => $link->BaseObj);
} elsif ($type eq 'ticket') {
$head .= $m->scomp('/Elements/TitleBoxStart', title => loc("Ticket #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
$head .= $m->scomp('/Widgets/TitleBoxStart', title => loc("Ticket #[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
$text .= $head;
$text .= $m->scomp('/Ticket/Elements/ShowSummary', Ticket => $link->BaseObj);
} else {
$head .= $m->scomp('/Elements/TitleBoxStart', title => loc("#[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
$head .= $m->scomp('/Widgets/TitleBoxStart', title => loc("#[_1]: [_2]", $link->BaseObj->Id, $link->BaseObj->Subject));
$text .= $head;
}
$text .= $m->scomp('/Ticket/Elements/ShowHistory' , Ticket => $link->BaseObj, Collapsed => ($type ne 'ticket'), ShowTitle => 0, ShowHeaders => 0, ShowDisplayModes => 0, ShowTitleBarCommands => 0);
$head .= $m->scomp('/Elements/TitleBoxEnd');
$text .= $m->scomp('/Elements/TitleBoxEnd');
$head .= $m->scomp('/Widgets/TitleBoxEnd');
$text .= $m->scomp('/Widgets/TitleBoxEnd');
$text .= $dep;
$text .= '</a>';
$show{$link->BaseObj->Id} = {
......
......@@ -46,13 +46,13 @@
<& /Elements/Callback, %ARGS, error => $error &>
<& /Elements/Header, Code => $Code, Why => $Why &>
<& /Elements/Tabs &>
<& /Elements/TitleBoxStart, class=> "error", title => $Title &>
<& /Widgets/TitleBoxStart, class=> "error", title => $Title &>
<%$Why%>
<br>
<font size=-1>
<%$Details%>
</font>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
</body>
</HTML>
......
......@@ -74,7 +74,8 @@
</TR>
</TABLE>
% }
</BODY>
</div>
</body>
</HTML>
% $m->abort();
......
......@@ -52,7 +52,8 @@
% }
<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png">
<link rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css">
<link rel="stylesheet" title="RT Classic" href="<%$RT::WebPath%>/NoAuth/ossf.css" type="text/css">
<link rel="stylesheet" title="OSSF" href="<%$RT::WebPath%>/NoAuth/ossf.css" type="text/css">
<script>
function hideshow(num) {
idstring = "element-" + num;
......@@ -67,7 +68,7 @@ function hideshow(num) {
</script>
<& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
</HEAD>
<BODY BGCOLOR="<%$BgColor%>"
<body
% if ($Focus) {
ONLOAD="
var tmp = (document.getElementsByName('<% $Focus %>'));
......@@ -75,6 +76,7 @@ ONLOAD="
"
% }
>
<div id="all">
<div class="logo"><a href="http://bestpractical.com"><img src="<%$RT::WebImagesURL%>/bplogo.gif" alt="<%loc("Best Practical Solutions, LLC corporate logo")%>" width="230" height="50"></a></div>
<div class="login-information">
<SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A></SPAN>
......
......@@ -44,7 +44,7 @@
%#
%# END BPS TAGGED BLOCK }}}
% if ($actions[0] ) {
<& /Elements/TitleBoxStart, title => loc('Results') &>
<& /Widgets/TitleBoxStart, title => loc('Results') &>
<UL>
% foreach my $action (@actions) {
% next unless ($action);
......@@ -54,7 +54,7 @@
<LI><%$action%></LI>
% }
</UL>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
<BR>
% }
<%init>
......
......@@ -56,31 +56,38 @@ if ($m->request_comp->path =~ '^/REST/\d+\.\d+/') {
<& /Elements/Callback, %ARGS, _CallbackName => 'Header' &>
<& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
<DIV class="dialog">
<div class="dialog">
% if ($Error) {
<& /Elements/TitleBoxStart, title => loc('Error') &>
<& /Widgets/TitleBoxStart, title => loc('Error') &>
<% $Error %>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
% }
<BR>
<& /Elements/TitleBoxStart, width=> "40%", titleright => loc("RT [_1]", $RT::VERSION), title => loc('Login') ,
<div id="loginform">
<& /Widgets/TitleBoxStart,titleright => loc("RT [_1]", $RT::VERSION), title => loc('Login') ,
contentbg=>"#cccccc" &>
% unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
<FORM id="login" name="login" METHOD=POST ACTION="<% (UNIVERSAL::can($r, 'uri') && ($r->uri) =~ m!.*/(.*)!) %>" >
<TABLE BORDER=0 WIDTH=100%>
<TR ALIGN=RIGHT>
<TD ALIGN=RIGHT><&|/l&>Username</&>:</TD><TD ALIGN=LEFT><input name=user value="<%$user%>"></TD></TR>
<TR><TD ALIGN=RIGHT><&|/l&>Password</&>:</TD><TD ALIGN=LEFT><input type=password name=pass></TD></TR>
<TR><TD colspan=2 align=right>
<input type=submit Value="<&|/l&>Login</&>">
</TD></TR>
</TABLE>
<form id="login" name="login" method="post" action="<% (UNIVERSAL::can($r, 'uri') && ($r->uri) =~ m!.*/(.*)!) %>">
<div class="input-row">
<span class="label"><&|/l&>Username</&>:</span>
<span class="input"><input name="user" value="<%$user%>" /></span>
</div>
<div class="input-row">
<span class="label"><&|/l&>Password</&>:</span>
<span class="input"><input type="password" name="pass" /></span>
</div>
<div class="button-row">
<span class="input"><input type="submit" Value="<&|/l&>Login</&>"></span>
</div>
%# Give callbacks a chance to add more control elements
<& /Elements/Callback, %ARGS &>
<&/Elements/TitleBoxEnd&>
<&/Widgets/TitleBoxEnd&>
% # From mason 1.0.1 forward, this doesn't work. in fact, it breaks things.
% # But on Mason 1.15 it's fixed again, so we still use it.
% # The code below iterates through everything in the passed in arguments
......@@ -100,9 +107,10 @@ contentbg=>"#cccccc" &>
% }
% }
% }
</FORM>
</form>
% }
</DIV>
</div><!-- #loginform -->
</div><!-- .dialog -->
<& /Elements/Footer, Menu => 0 &>
<%ARGS>
$user => ""
......
......@@ -43,7 +43,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
<&|/Elements/TitleBox,
<&|/Widgets/TitleBox,
title => loc("[_1] newest unowned tickets", $rows),
class => 'my-requests',
title_href => "Search/Results.html".$QueryString &>
......
......@@ -43,7 +43,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
<&|/Elements/TitleBox,
<&|/Widgets/TitleBox,
class => 'my-tickets',
title => loc('[_1] highest priority tickets I own', $rows),
title_href => "Search/Results.html".$QueryString &>
......
......@@ -43,28 +43,27 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/TitleBoxStart, title => loc('Quick ticket creation') &>
<div class="quick-create">
<& /Widgets/TitleBoxStart, title => loc('Quick ticket creation') &>
<form method="post" action="<%$RT::WebPath%>/index.html">
<input type="hidden" name="QuickCreate" value="1">
<table>
<tr>
<td>
<font size="-2"><&|/l&>Subject</&>:<br><input size="15" name="Subject"></font>
</td>
<td>
<font size="-2"><&|/l&>Queue</&>:<br><& /Elements/SelectQueue, Name => 'Queue', ShowNullOption => 0 &></font>
</td>
<td>
<font size="-2"><&|/l&>Owner</&>:<br>
<tr><td>
<&|/l&>Subject</&>:<br><input size="15" name="Subject"/>
</td><td>
<&|/l&>Queue</&>:<br><& /Elements/SelectQueue, Name => 'Queue', ShowNullOption => 0 &>
</td><td>
<&|/l&>Owner</&>:<br/>
<select type="select" name="Owner">
<option value="<%$session{'CurrentUser'}->id%>" SELECTED><%$session{'CurrentUser'}->Name %></option>
<option value="<%$RT::Nobody->id%>"><%loc('Nobody')%></option>
</select>
</font>
</td>
</tr>
%#<tr><td colspan="3"><font size="-2"><textarea cols="50" rows="3"></textarea></font></td></tr>
</table>
<div align="right"><input type="submit" value="<%loc('Create')%>"></div>
</form>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
</div>
......@@ -44,11 +44,11 @@
%#
%# END BPS TAGGED BLOCK }}}
<div class="ticket-overview">
<& /Elements/TitleBoxStart, title => loc("Quick search"), bodyclass => "", class=> 'ticket-overview' &>
<& /Widgets/TitleBoxStart, title => loc("Quick search"), bodyclass => "", class=> 'ticket-overview' &>
<TABLE>
<tr>
<th class="collection-as-table" align=left><&|/l&>Queue</&></th>
<th class="collection-as-table" align=left><&|/l&>Queue</&></th>
<th class="collection-as-table" align=right><&|/l&>New</&></th>
<th class="collection-as-table" align=right><&|/l&>Open</&></th>
</tr>
......@@ -79,7 +79,7 @@ while (my $queue = $Queues->Next) {
</TR>
% }
</TABLE>
<& /Elements/TitleBoxEnd &>
<& /Widgets/TitleBoxEnd &>
</div>
<%INIT>
my $Queues = RT::Queues->new($session{'CurrentUser'});
......
div.nowrap
{
white-space: nowrap;
}
/* BEGIN Login Form */
div#loginform
{
width: 100%;
}
div#loginform div.input-row
{
text-align: center;
margin-top: 5px;
margin-bottom: 5px;
width: auto;
}
div#loginform div.input-row span.label
{
width: 40%;
font-size: 12pt;
}
div#loginform div.input-row span.input
{
width: 60%;
}
div#loginform div.input-row input
{
width: 60%;
}
div#loginform div.button-row
{
padding-right: 8px;
text-align: right;
}
div#loginform div.button-row input
{
width: auto;
}
/* END Login Form */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment