[Rt-commit] rt branch, 4.4/article-readonly-fields, created. rt-4.4.0-54-g6c04d73
Dustin Graves
dustin at bestpractical.com
Mon Mar 21 20:21:30 EDT 2016
The branch, 4.4/article-readonly-fields has been created
at 6c04d7340add25c83c6b575f66336311ce3ab380 (commit)
- Log -----------------------------------------------------------------
commit e04dfd85189fe62c658928e0355d4a85dfe1c70e
Author: Dustin Graves <dustin at bestpractical.com>
Date: Tue Mar 22 00:18:49 2016 +0000
update style of articles display/modify to more match tickets
diff --git a/share/html/Articles/Article/Display.html b/share/html/Articles/Article/Display.html
index 73401de..bae9a69 100644
--- a/share/html/Articles/Article/Display.html
+++ b/share/html/Articles/Article/Display.html
@@ -47,17 +47,33 @@
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
<& /Elements/Tabs &>
-<h2><&|/l&>Basics</&></h2>
-<span class="label"><&|/l&>Class</&></span>: <span class="value"><%$article->ClassObj->Name%></span><br />
-<em><span class="value"><%$article->Summary%></span></em>
-<h2><&|/l&>Content</&></h2>
+
+<&| /Widgets/TitleBox, title => loc('The Basics'), class => 'article-basics', &>
+<table>
+ <tr>
+ <td class="label"><&|/l&>Summary</&>:</td>
+ <td class="value"><%$article->Summary%></td>
+ </tr>
+ <tr>
+ <td class="label"><&|/l&>Class</&>:</td>
+ <td class="value"><%$article->ClassObj->Name%></td>
+ </tr>
+</table>
+</&>
+
+% $m->callback( %ARGS, CallbackName => 'AfterBasics' );
+
+<&| /Widgets/TitleBox, title => loc('Content'), class => 'article-content', &>
<& /Elements/ShowCustomFields, Object => $article &>
+</&>
-<h2><&|/l&>Links</&></h2>
+<&| /Widgets/TitleBox, title => loc('Links'), class => 'article-links', &>
<& Elements/ShowLinks, article => $article &>
+</&>
-<h2><&|/l&>Topics</&></h2>
+<&| /Widgets/TitleBox, title => loc('Topics'), class => 'article-topics', &>
<& Elements/ShowTopics, article => $article &>
+</&>
<%init>
my $article = RT::Article->new( $session{'CurrentUser'} );
diff --git a/share/html/Articles/Article/Edit.html b/share/html/Articles/Article/Edit.html
index e93401b..f2905e6 100644
--- a/share/html/Articles/Article/Edit.html
+++ b/share/html/Articles/Article/Edit.html
@@ -52,53 +52,41 @@
<form method="post" action="Edit.html" name="EditArticle" id="EditArticle" enctype="multipart/form-data">
<input type="hidden" name="next" value="<%$ARGS{next}||''%>" />
<input type="hidden" name="id" value="<%$id%>" />
-<table width="100%">
-<tr>
-<td><h2><&|/l&>Basics</&></h2></td>
-<td></td>
-</tr>
+
+<&| /Widgets/TitleBox, title => $title, class => 'article-basics', &>
<& Elements/EditBasics, ArticleObj => $ArticleObj,
EditClass =>$EditClass,
- ClassObj => $ClassObj,
+ ClassObj => $ClassObj,
%ARGS ,
id => $id
&>
+</&>
-<tr>
-<td><h2><&|/l&>Content</&></h2></td>
-<td></td>
-</tr>
-<& Elements/EditCustomFields, ArticleObj => $ArticleObj,
- CFContent => \%CFContent,
- ClassObj => $ClassObj,
+<&| /Widgets/TitleBox, title => 'Content', class => 'article-content', &>
+<& Elements/EditCustomFields, ArticleObj => $ArticleObj,
+ CFContent => \%CFContent,
+ ClassObj => $ClassObj,
%ARGS,
id =>$id,
&>
+</&>
-<tr>
-<td><h2><&|/l&>Links</&></h2></td>
-<td></td>
-</tr>
-<& Elements/EditLinks, ArticleObj => $ArticleObj,
+<&| /Widgets/TitleBox, title => 'Links', class => 'article-links', &>
+<& Elements/EditLinks, ArticleObj => $ArticleObj,
%ARGS,
id => $id
&>
-<tr>
-<td><h2><&|/l&>Topics</&></h2></td>
-<td></td>
-</tr>
-<tr>
-<td class="label"><&|/l&>Topics</&></td>
-<td>
+</&>
+
+<&| /Widgets/TitleBox, title => 'Topics', class => 'article-topics', &>
<& Elements/EditTopics, ArticleObj => $ArticleObj,
Classes => [$ArticleObj->Id ? $ArticleObj->ClassObj : $ClassObj],
OnlyThisClass => 1,
%ARGS,
id => $id
&>
-</td>
-</tr>
-</table>
+</&>
+
<& /Elements/Submit, Label => ($id eq 'new' ? loc('Create') : loc('Save Changes')), color => "#993333" &>
</form>
@@ -181,7 +169,7 @@ elsif ( $id eq 'new' ) {
if ( $ARGS{next} ) {
$m->redirect($ARGS{next});
- }
+ }
else {
MaybeRedirectForResults(
Actions => \@results,
diff --git a/share/html/Articles/Article/Elements/EditBasics b/share/html/Articles/Article/Elements/EditBasics
index 8addca3..267159b 100644
--- a/share/html/Articles/Article/Elements/EditBasics
+++ b/share/html/Articles/Article/Elements/EditBasics
@@ -45,16 +45,17 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<table>
<tr>
-<td class="label"><&|/l&>Name</&></td>
+<td class="label"><&|/l&>Name</&>:</td>
<td><input name="Name" value="<%($ARGS{'id'} eq 'new' ? '' : $ArticleObj->Name) || $ARGS{'Name'} || ''|h%>" size="50" /></td>
</tr>
<tr>
-<td class="label"><&|/l&>Summary</&></td>
+<td class="label"><&|/l&>Summary</&>:</td>
<td><input name="Summary" value="<%($ARGS{'id'} eq 'new' ? '' : $ArticleObj->Summary) || $ARGS{'Summary'} ||'' |h%>" size="50" /></td>
</tr>
<tr>
-<td class="label"><&|/l&>Class</&></td>
+<td class="label"><&|/l&>Class</&>:</td>
<td>
% if ($EditClass) {
<& /Articles/Elements/SelectClass, Name => 'Class', Default =>$ArticleObj->ClassObj->Id&>
@@ -73,6 +74,7 @@
<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this article)</&></label>
</td>
</tr>
+</table>
% }
<%INIT>
</%INIT>
diff --git a/share/html/Articles/Article/Elements/EditCustomFields b/share/html/Articles/Article/Elements/EditCustomFields
index 273d96c..cfd21a3 100644
--- a/share/html/Articles/Article/Elements/EditCustomFields
+++ b/share/html/Articles/Article/Elements/EditCustomFields
@@ -45,9 +45,13 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<table>
% while (my $CustomField = $CustomFields->Next()) {
<tr>
- <td class="labeltop"><b><%$CustomField->Name%></b><br /><i><%$CustomField->EntryHint // ''%></i></td>
+ <td class="cflabel">
+ <span class="name"><%$CustomField->Name%>:</span><br />
+ <span class="type"><%$CustomField->EntryHint // ''%></span>
+ </td>
<td class="entry"><& /Elements/EditCustomField,
Object => $ArticleObj,
CustomField => $CustomField,
@@ -56,6 +60,7 @@
Cols => 70
&></td>
</tr>
+</table>
% }
<%INIT>
my $CustomFields;
diff --git a/share/html/Articles/Article/Elements/EditLinks b/share/html/Articles/Article/Elements/EditLinks
index 6f6dce5..6d16ee5 100644
--- a/share/html/Articles/Article/Elements/EditLinks
+++ b/share/html/Articles/Article/Elements/EditLinks
@@ -45,6 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<table>
<tr>
<td class="label"></td>
<td class="value"><i><&|/l&>Enter articles, tickets, or other URLs related to this article.</&>
@@ -107,6 +108,7 @@
</ul>
</td>
</tr>
+</table>
<%ARGS>
$ArticleObj => undef
$id => undef
diff --git a/share/html/Articles/Article/Elements/EditTopics b/share/html/Articles/Article/Elements/EditTopics
index c1eaa55..b3ef1bc 100644
--- a/share/html/Articles/Article/Elements/EditTopics
+++ b/share/html/Articles/Article/Elements/EditTopics
@@ -45,6 +45,10 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<table>
+<tr>
+<td class="label"><&|/l&>Topics</&>:</td>
+<td class="value">
<input type="hidden" name="EditTopics" value="1" />
<select multiple size="10" name="Topics" class="selection-box">
% if (@Classes) {
@@ -76,6 +80,9 @@
</optgroup>
% }
</select>
+</td>
+</tr>
+</table>
<%INIT>
use Tree::Simple;
diff --git a/share/html/Articles/Article/Elements/ShowLinks b/share/html/Articles/Article/Elements/ShowLinks
index 569b040..4466eee 100644
--- a/share/html/Articles/Article/Elements/ShowLinks
+++ b/share/html/Articles/Article/Elements/ShowLinks
@@ -45,8 +45,11 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<span class="label"><&|/l&>Refers to</&></span>:<br />
-<ul class="value">
+
+<table>
+<tr>
+<td class="label"><&|/l&>Refers to</&>:</td>
+<td class="value">
% my $refersto = $article->RefersTo;
% while (my $link = $refersto->Next) {
@@ -65,10 +68,11 @@
% }
</li>
% }
-</ul>
+</td>
+</tr>
-<span class="label"><&|/l&>Referred to by</&></span>:<br />
-<ul class="value">
+<td class="label"><&|/l&>Referred to by</&>:</td>
+<td class="value">
% my $referredtoby = $article->ReferredToBy;
% while (my $link = $referredtoby->Next) {
% my $member = $link->BaseURI;
@@ -86,7 +90,9 @@
% }
</li>
% }
-</ul>
+</td>
+</tr>
+</table>
<%args>
$article => undef
</%args>
diff --git a/share/html/Articles/Article/Elements/ShowTopics b/share/html/Articles/Article/Elements/ShowTopics
index 2213aab..fa4cbd4 100644
--- a/share/html/Articles/Article/Elements/ShowTopics
+++ b/share/html/Articles/Article/Elements/ShowTopics
@@ -45,13 +45,18 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<table>
+<tr>
+<td class="label"><&|/l&>Topics</&>:</td>
+<td class="value">
% my $topics = RT::ObjectTopics->new($session{'CurrentUser'});
% $topics->LimitToObject($article);
-% my @topics;
% while (my $t = $topics->Next) {
<& /Articles/Elements/ShowTopic, topic => $t->TopicObj &><br />
% }
-<br />
+</td>
+</tr>
+</table>
<%args>
$article => undef
commit 6c04d7340add25c83c6b575f66336311ce3ab380
Author: Dustin Graves <dustin at bestpractical.com>
Date: Tue Mar 22 00:20:36 2016 +0000
add Creator, Created, and Updated fields to articles display/modify
diff --git a/share/html/Articles/Article/Display.html b/share/html/Articles/Article/Display.html
index bae9a69..21943dd 100644
--- a/share/html/Articles/Article/Display.html
+++ b/share/html/Articles/Article/Display.html
@@ -58,6 +58,18 @@
<td class="label"><&|/l&>Class</&>:</td>
<td class="value"><%$article->ClassObj->Name%></td>
</tr>
+ <tr>
+ <td class="label"><&|/l&>Creator</&>:</td>
+ <td class="value"><& /Elements/ShowUser, User => $article->CreatorObj &></td>
+ </tr>
+ <tr>
+ <td class="label"><&|/l&>Created</&>:</td>
+ <td class="value"><%$article->CreatedObj->AsString%></td>
+ </tr>
+ <tr>
+ <td class="label"><&|/l&>Updated</&>:</td>
+ <td class="value"><%$article->LastUpdatedObj->AsString%></td>
+ </tr>
</table>
</&>
diff --git a/share/html/Articles/Article/Elements/EditBasics b/share/html/Articles/Article/Elements/EditBasics
index 267159b..aa04171 100644
--- a/share/html/Articles/Article/Elements/EditBasics
+++ b/share/html/Articles/Article/Elements/EditBasics
@@ -65,6 +65,20 @@
% }
</td>
</tr>
+% if ($ARGS{'id'} ne 'new') {
+<tr>
+<td class="label"><&|/l&>Creator</&>:</td>
+<td><& /Elements/ShowUser, User => $ArticleObj->CreatorObj &></td>
+</tr>
+<tr>
+<td class="label"><&|/l&>Created</&>:</td>
+<td><span class="value"><%$ArticleObj->CreatedObj->AsString%></span></td>
+</tr>
+<tr>
+<td class="label"><&|/l&>Updated</&>:</td>
+<td><span class="value"><%$ArticleObj->LastUpdatedObj->AsString%></span></td>
+</tr>
+% }
% if ($ARGS{'id'} eq 'new' || $ArticleObj->CurrentUserHasRight('DisableArticle')) {
<tr>
<td class="label"></td>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list