[prev in list] [next in list] [prev in thread] [next in thread]
List: bricolage-commits
Subject: [8367] Fix for bug 1382, improving Delete this Profile text
From: rolfm () bricolage ! cc
Date: 2008-11-05 20:54:16
Message-ID: 20081105205417.37CF2CB9AF () x12 ! develooper ! com
[Download RAW message or body]
Revision: 8367
Author: rolfm
Date: 2008-11-05 12:54:13 -0800 (Wed, 05 Nov 2008)
ViewCVS: http://viewsvn.bricolage.cc/?rev=8367&view=rev
Log Message:
-----------
Fix for bug 1382, improving Delete this Profile text
Bugzilla Links:
--------------
http://bugs.bricolage.cc/show_bug.cgi?id=1382
Modified Paths:
--------------
bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc
bricolage/trunk/comp/widgets/profile/buttonBar.mc
bricolage/trunk/comp/widgets/profile/formButtons.mc
Modified: bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc
===================================================================
--- bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc 2008-10-24 12:43:30 UTC \
(rev 8366)
+++ bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc 2008-11-05 20:54:13 UTC \
(rev 8367) @@ -120,6 +120,7 @@
} else {
$m->out( "var optionalFields = ''\n" );
}
+ my $label = get_disp_name($type);
</%perl>
</script>
@@ -239,7 +240,7 @@
<div class="delete">
<& '/widgets/profile/displayFormElement.mc',
key => 'delete',
- vals => { disp => '<span class="burgandyLabel">'.$lang->maketext('Delete \
this Profile').'</span>', + vals => { disp => '<span \
class="burgandyLabel">'.$lang->maketext('Delete this '. $label).'</span>', props => \
{ type => 'checkbox', label_after => 1 },
# value => '0',
Modified: bricolage/trunk/comp/widgets/profile/buttonBar.mc
===================================================================
--- bricolage/trunk/comp/widgets/profile/buttonBar.mc 2008-10-24 12:43:30 UTC (rev \
8366)
+++ bricolage/trunk/comp/widgets/profile/buttonBar.mc 2008-11-05 20:54:13 UTC (rev \
8367) @@ -23,12 +23,16 @@
</%args>
<%init>;
my $pkg;
+my $disp;
if ($widget eq 'story_prof') {
$pkg = get_package_name('story');
+ $disp = get_disp_name('story');
} elsif ($widget eq 'media_prof') {
$pkg = get_package_name('media');
+ $disp = get_disp_name('media');
} else {
$pkg = get_package_name('template');
+ $disp = get_disp_name('template');
}
my $deskText = qq{<select name="$widget|desk">};
@@ -79,7 +83,7 @@
name => "$widget|delete",
id => $widget . "delete",
value => "Delete",
- disp => $lang->maketext('Delete this Profile'),
+ disp => $lang->maketext("Delete this " . $disp),
label_after => 1,
useTable => 0,
&>
Modified: bricolage/trunk/comp/widgets/profile/formButtons.mc
===================================================================
--- bricolage/trunk/comp/widgets/profile/formButtons.mc 2008-10-24 12:43:30 UTC (rev \
8366)
+++ bricolage/trunk/comp/widgets/profile/formButtons.mc 2008-11-05 20:54:13 UTC (rev \
8367) @@ -10,7 +10,7 @@
$no_save => 0
$stay => ''
$widget => 'profile'
-$chk_label => 'Delete this Profile'
+$chk_label => 'Delete this '
$ret_val => 'cancel_red'
</%args>
@@ -25,8 +25,7 @@
vals => { props => { type => 'checkbox' } },
useTable => 0
) unless $no_del;
-
-$m->out(' <span class="burgandyLabel">' . $lang->maketext($chk_label) . \
'</span>') unless $no_del; +$m->out(' <span class="burgandyLabel">' . \
$lang->maketext($chk_label.get_disp_name($type)) . '</span>') unless $no_del; \
</%perl> </td>
</tr>
[Attachment #3 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: \
6px; } #msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<title>[8367] Fix for bug 1382, improving Delete this Profile text</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://viewsvn.bricolage.cc/?rev=8367&view=rev">8367</a></dd> \
<dt>Author</dt> <dd>rolfm</dd> <dt>Date</dt> <dd>2008-11-05 12:54:13 -0800 (Wed, 05 \
Nov 2008)</dd> </dl>
<h3>Log Message</h3>
<pre>Fix for <a href="http://bugs.bricolage.cc/show_bug.cgi?id=1382">bug 1382</a>, \
improving Delete this Profile text</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#bricolagetrunkcompwidgetsformBuilderformBuildermc">bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc</a></li>
<li><a href="#bricolagetrunkcompwidgetsprofilebuttonBarmc">bricolage/trunk/comp/widgets/profile/buttonBar.mc</a></li>
<li><a href="#bricolagetrunkcompwidgetsprofileformButtonsmc">bricolage/trunk/comp/widgets/profile/formButtons.mc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="bricolagetrunkcompwidgetsformBuilderformBuildermc"></a>
<div class="modfile"><h4>Modified: \
bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc (8366 => 8367)</h4> <pre \
class="diff"><span> <span class="info">--- \
bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc 2008-10-24 12:43:30 UTC (rev \
8366)
+++ bricolage/trunk/comp/widgets/formBuilder/formBuilder.mc 2008-11-05 20:54:13 UTC \
(rev 8367) </span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $m->out( "var optionalFields = ''\n" );
</span><span class="cx"> }
</span><ins>+ my $label = get_disp_name($type);
</ins><span class="cx"> </%perl>
</span><span class="cx">
</span><span class="cx"> </script>
</span><span class="lines">@@ -239,7 +240,7 @@
</span><span class="cx"> <div class="delete">
</span><span class="cx"> <& '/widgets/profile/displayFormElement.mc',
</span><span class="cx"> key => 'delete',
</span><del>- vals => { disp => '<span \
class="burgandyLabel">'.$lang->maketext('Delete this \
Profile').'</span>', </del><ins>+ vals => { disp => '<span \
class="burgandyLabel">'.$lang->maketext('Delete this '. \
$label).'</span>', </ins><span class="cx"> props => { \
type => 'checkbox', </span><span class="cx"> \
label_after => 1 }, </span><span class="cx"> # value => '0',
</span></span></pre></div>
<a id="bricolagetrunkcompwidgetsprofilebuttonBarmc"></a>
<div class="modfile"><h4>Modified: bricolage/trunk/comp/widgets/profile/buttonBar.mc \
(8366 => 8367)</h4> <pre class="diff"><span>
<span class="info">--- bricolage/trunk/comp/widgets/profile/buttonBar.mc 2008-10-24 \
12:43:30 UTC (rev 8366)
+++ bricolage/trunk/comp/widgets/profile/buttonBar.mc 2008-11-05 20:54:13 UTC (rev \
8367) </span><span class="lines">@@ -23,12 +23,16 @@
</span><span class="cx"> </%args>
</span><span class="cx"> <%init>;
</span><span class="cx"> my $pkg;
</span><ins>+my $disp;
</ins><span class="cx"> if ($widget eq 'story_prof') {
</span><span class="cx"> $pkg = get_package_name('story');
</span><ins>+ $disp = get_disp_name('story');
</ins><span class="cx"> } elsif ($widget eq 'media_prof') {
</span><span class="cx"> $pkg = get_package_name('media');
</span><ins>+ $disp = get_disp_name('media');
</ins><span class="cx"> } else {
</span><span class="cx"> $pkg = get_package_name('template');
</span><ins>+ $disp = get_disp_name('template');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my $deskText = qq{<select \
name="$widget|desk">}; </span><span class="lines">@@ -79,7 +83,7 @@
</span><span class="cx"> name => "$widget|delete",
</span><span class="cx"> id => $widget . "delete",
</span><span class="cx"> value => "Delete",
</span><del>- disp => $lang->maketext('Delete this Profile'),
</del><ins>+ disp => $lang->maketext("Delete this " . \
$disp), </ins><span class="cx"> label_after => 1,
</span><span class="cx"> useTable => 0,
</span><span class="cx"> &>
</span></span></pre></div>
<a id="bricolagetrunkcompwidgetsprofileformButtonsmc"></a>
<div class="modfile"><h4>Modified: \
bricolage/trunk/comp/widgets/profile/formButtons.mc (8366 => 8367)</h4> <pre \
class="diff"><span> <span class="info">--- \
bricolage/trunk/comp/widgets/profile/formButtons.mc 2008-10-24 12:43:30 UTC (rev \
8366)
+++ bricolage/trunk/comp/widgets/profile/formButtons.mc 2008-11-05 20:54:13 UTC (rev \
8367) </span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> $no_save => 0
</span><span class="cx"> $stay => ''
</span><span class="cx"> $widget => 'profile'
</span><del>-$chk_label => 'Delete this Profile'
</del><ins>+$chk_label => 'Delete this '
</ins><span class="cx"> $ret_val => 'cancel_red'
</span><span class="cx"> </%args>
</span><span class="cx">
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx"> vals => { props => { type => 'checkbox' } \
}, </span><span class="cx"> useTable => 0
</span><span class="cx"> ) unless $no_del;
</span><del>-
-$m->out('&nbsp;<span class="burgandyLabel">' . \
$lang->maketext($chk_label) . '</span>') unless $no_del; \
</del><ins>+$m->out('&nbsp;<span class="burgandyLabel">' . \
$lang->maketext($chk_label.get_disp_name($type)) . '</span>') unless \
$no_del; </ins><span class="cx"> </%perl>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre>
</div>
</div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic