[Jifty-commit] r2919 - in jifty/branches/template-declare: .
lib/Jifty lib/Jifty/Manual lib/Jifty/Mason lib/Jifty/Web
lib/Jifty/Web/Form plugins/EditInPlace/lib/Jifty/Plugin
share/web/static/css share/web/static/js share/web/templates/__jifty
share/web/templates/__jifty/error/_elements
share/web/templates/_elements
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Mar 7 12:37:27 EST 2007
Author: jesse
Date: Wed Mar 7 12:37:22 2007
New Revision: 2919
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/Makefile.PL
jifty/branches/template-declare/lib/Jifty/Manual/UsingCSSandJS.pod
jifty/branches/template-declare/lib/Jifty/Mason/Halo.pm
jifty/branches/template-declare/lib/Jifty/Test.pm
jifty/branches/template-declare/lib/Jifty/Web.pm
jifty/branches/template-declare/lib/Jifty/Web/Form.pm
jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
jifty/branches/template-declare/lib/Jifty/Web/Menu.pm
jifty/branches/template-declare/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
jifty/branches/template-declare/plugins/Login/share/web/templates/login
jifty/branches/template-declare/share/web/static/css/base.css
jifty/branches/template-declare/share/web/static/css/context-menus.css
jifty/branches/template-declare/share/web/static/css/forms.css
jifty/branches/template-declare/share/web/static/css/halos.css
jifty/branches/template-declare/share/web/static/css/notices.css
jifty/branches/template-declare/share/web/static/js/context_menu.js
jifty/branches/template-declare/share/web/static/js/jifty.js
jifty/branches/template-declare/share/web/templates/__jifty/error/_elements/wrapper
jifty/branches/template-declare/share/web/templates/__jifty/halo
jifty/branches/template-declare/share/web/templates/_elements/wrapper
Log:
r53165 at pinglin (orig r2915): hlb | 2007-03-06 07:27:06 -0500
Rollback all id & class names changed in r2910 & r2912.
We have to deal on the backward compatibility first.
r53167 at pinglin (orig r2917): alexmv | 2007-03-06 17:07:01 -0500
r17706 at zoq-fot-pik: chmrr | 2007-03-06 17:06:29 -0500
* Log::Log4perl::Appender::String (used in tests) was only added in
1.02; require at least that
r53168 at pinglin (orig r2918): sterling | 2007-03-06 17:11:22 -0500
import_extra now passes the import parameters to setup; updated Jifty::Test docs
Modified: jifty/branches/template-declare/Makefile.PL
==============================================================================
--- jifty/branches/template-declare/Makefile.PL (original)
+++ jifty/branches/template-declare/Makefile.PL Wed Mar 7 12:37:22 2007
@@ -45,7 +45,7 @@
requires('Jifty::DBI' => '0.31' ); # Jifty::DBI::Collection Jifty::DBI::Handle Jifty::DBI::Record::Cachable Jifty::DBI::SchemaGenerator
requires('Locale::Maketext::Extract' => '0.20');
requires('Locale::Maketext::Lexicon' => '0.60');
-requires('Log::Log4perl');
+requires('Log::Log4perl' => '1.04');
requires('LWP::UserAgent'); # Net::HTTP
requires('MIME::Types');
requires('Module::Pluggable' => '3.1'); # Module::Pluggable::Object
Modified: jifty/branches/template-declare/lib/Jifty/Manual/UsingCSSandJS.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/UsingCSSandJS.pod (original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/UsingCSSandJS.pod Wed Mar 7 12:37:22 2007
@@ -92,7 +92,7 @@
=item widget, button, button_as_link, combobox,
combo-text, combo-button, combo-list, date, label, password
-jifty-submit-button, reset, text, hidden, ajaxvalidation,
+submit_button, reset, text, hidden, ajaxvalidation,
ajaxcanonicalization, ajaxautocompletes
These class names are used depending on the type of widget getting
@@ -102,7 +102,7 @@
used for the autocomplete div.
-=item toplevel, menu, context-menu, submenu, title, expand
+=item toplevel, menu, context_menu, submenu, title, expand
These classes are used in navigation bars.
Modified: jifty/branches/template-declare/lib/Jifty/Mason/Halo.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Mason/Halo.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Mason/Halo.pm Wed Mar 7 12:37:22 2007
@@ -102,7 +102,7 @@
$context->request->out(
Jifty->web->link(
label => _( 'Edit %1', $comp_name ),
- class => 'inline-edit',
+ class => 'inline_edit',
onclick => [
{ element => "#halo-" . $frame->{id},
replace_with =>
Modified: jifty/branches/template-declare/lib/Jifty/Test.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Test.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Test.pm Wed Mar 7 12:37:22 2007
@@ -113,16 +113,44 @@
sub import_extra {
my $class = shift;
- $class->setup;
+ my $args = shift;
+ $class->setup($args);
Test::More->export_to_level(2);
}
-=head2 setup
+=head2 setup ARGS
+
+This method is passed a single argument. This is a reference to the array of parameters passed in to the import statement.
Merges the L</test_config> into the default configuration, resets the
-database, and resets the fake "outgoing mail" folder. This is the
-method to override if you wish to do custom setup work, such as insert
-test data into your database.
+database, and resets the fake "outgoing mail" folder.
+
+This is the method to override if you wish to do custom setup work, such as
+insert test data into your database.
+
+ package MyApp::Test;
+ use base qw/ Jifty::Test /;
+
+ sub setup {
+ my $self = shift;
+ my $args = shift;
+
+ # Make sure to call the super-class version
+ $self->SUPER::setup($args);
+
+ # Now that we have the database and such...
+ my %test_args = @$args;
+
+ if ($test_arg{something_special}) {
+ # do something special...
+ }
+ }
+
+And later in your tests, you may do the following:
+
+ use MyApp::Test tests => 14, something_special => 1;
+
+ # 14 tests with some special setup...
=cut
Modified: jifty/branches/template-declare/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web.pm Wed Mar 7 12:37:22 2007
@@ -872,12 +872,12 @@
return unless grep {$_->$type()} values %results;
- my $plural = "jifty-" . $type . "s";
- $self->out(qq{<div class="jifty results jifty-messages" id="$plural">});
+ my $plural = $type . "s";
+ $self->out(qq{<div class="jifty results messages" id="$plural">});
foreach my $moniker ( sort keys %results ) {
if ( $results{$moniker}->$type() ) {
- $self->out( qq{<div class="jifty-$type $moniker">}
+ $self->out( qq{<div class="$type $moniker">}
. $results{$moniker}->$type()
. qq{</div>} );
}
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form.pm Wed Mar 7 12:37:22 2007
@@ -219,7 +219,7 @@
my $self = shift;
my $button = Jifty::Web::Form::Clickable->new(submit => undef, @_)->generate;
- Jifty->web->out(qq{<div class="jifty-submit-button">});
+ Jifty->web->out(qq{<div class="submit_button">});
$button->render_widget;
Jifty->web->out(qq{</div>});
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm Wed Mar 7 12:37:22 2007
@@ -327,7 +327,7 @@
=head2 render
-Outputs this form element in a span with class C<form-field>. This
+Outputs this form element in a span with class C<form_field>. This
outputs the label, the widget itself, any hints, any errors, and any
warnings using L</render_label>, L</render_widget>, L</render_hints>,
L</render_errors>, and L</render_warnings>, respectively. Returns an
@@ -412,7 +412,7 @@
sub render_wrapper_start {
my $self = shift;
- my @classes = qw(form-field);
+ my @classes = qw(form_field);
if ($self->mandatory) { push @classes, 'mandatory' }
if ($self->name) { push @classes, 'argument-'.$self->name }
Jifty->web->out('<div class="'.join(' ', @classes).'">' ."\n");
Modified: jifty/branches/template-declare/lib/Jifty/Web/Menu.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Menu.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Menu.pm Wed Mar 7 12:37:22 2007
@@ -204,7 +204,7 @@
sub render_as_context_menu {
my $self = shift;
- Jifty->web->out( qq{<ul class="context-menu">});
+ Jifty->web->out( qq{<ul class="context_menu">});
$self->render_as_hierarchical_menu_item();
Jifty->web->out(qq{</ul>});
'';
Modified: jifty/branches/template-declare/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
==============================================================================
--- jifty/branches/template-declare/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm (original)
+++ jifty/branches/template-declare/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm Wed Mar 7 12:37:22 2007
@@ -20,7 +20,7 @@
comp_source =>
"
<span id=\"create-component-$comp_name\">
-<% Jifty->web->link(class => 'inline-create', label => 'Create $comp_name', onclick => [ { element => \"#create-component-$comp_name\", replace_with => '/__jifty/edit_inline/mason_component/$comp_name' } ]) %>
+<% Jifty->web->link(class => 'inline_create', label => 'Create $comp_name', onclick => [ { element => \"#create-component-$comp_name\", replace_with => '/__jifty/edit_inline/mason_component/$comp_name' } ]) %>
</span>
");
Modified: jifty/branches/template-declare/plugins/Login/share/web/templates/login
==============================================================================
--- jifty/branches/template-declare/plugins/Login/share/web/templates/login (original)
+++ jifty/branches/template-declare/plugins/Login/share/web/templates/login Wed Mar 7 12:37:22 2007
@@ -10,7 +10,7 @@
<% $action->form_field('email') %>
<% $action->form_field('password') %>
<% $action->form_field('remember') %>
-<div class="jifty-submit-button">
+<div class="submit_button">
<% Jifty->web->return(label => _('Login'), to => '/', submit => $action) %>
</div>
<% Jifty->web->form->end %>
Modified: jifty/branches/template-declare/share/web/static/css/base.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/base.css (original)
+++ jifty/branches/template-declare/share/web/static/css/base.css Wed Mar 7 12:37:22 2007
@@ -4,7 +4,7 @@
body.calpopup {
}
-.jifty-error {
+.error {
color: #a00000;
}
@@ -20,11 +20,11 @@
clear: both;
}
-.jifty-messages .jifty-message {
+.messages .message {
display: block;
}
-div#jifty-messages, div#jifty-errors {
+div#messages, div#errors {
background-color: rgb(240,234,183);
border: 1px solid rgb(230,224,173);
margin-top: 10px;
@@ -62,7 +62,7 @@
-div.jifty-warning {
+div.warning {
position: absolute;
top: 0;
left: 0;
@@ -74,7 +74,7 @@
border-bottom: 1px solid #000;
}
-div.jifty-warning a {
+div.warning a {
color: white;
}
Modified: jifty/branches/template-declare/share/web/static/css/context-menus.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/context-menus.css (original)
+++ jifty/branches/template-declare/share/web/static/css/context-menus.css Wed Mar 7 12:37:22 2007
@@ -1,15 +1,15 @@
-ul.context-menu {
+ul.context_menu {
clear: none;
float: left;
}
-ul.context-menu, ul.context-menu ul {
+ul.context_menu, ul.context_menu ul {
list-style: none;
margin-left: 0;
padding-left: 0;
}
-.context-menu li.toplevel {
+.context_menu li.toplevel {
float: left;
margin: 0 0.5em 0 0;
padding: 0.2em;
@@ -21,15 +21,15 @@
color: #793300;
}
-.context-menu li.toplevel ul li {
+.context_menu li.toplevel ul li {
color: gray;
}
-.context-menu li.toplevel .title {
+.context_menu li.toplevel .title {
font-weight: bold;
}
-.context-menu li.toplevel ul {
+.context_menu li.toplevel ul {
font-size: 0.9em;
display: none;
@@ -41,16 +41,16 @@
border-bottom: 1px solid grey;
}
-.context-menu li.toplevel ul a {
+.context_menu li.toplevel ul a {
width: 100%;
display: block;
}
-.context-menu .open span.expand a {
+.context_menu .open span.expand a {
background-image: url(/static/images/silk/bullet_arrow_up.png);
}
-.context-menu span.expand a {
+.context_menu span.expand a {
background: url(/static/images/silk/bullet_arrow_down.png) no-repeat center center;
padding-left: 16px;
border: 1px solid transparent;
@@ -59,29 +59,29 @@
min-height: 1em;
}
-.context-menu li.toplevel:hover .expand a {
+.context_menu li.toplevel:hover .expand a {
border-top: 1px solid grey;
border-left: 1px solid grey;
border-right: 1px solid lightgrey;
border-bottom: 1px solid lightgrey;
}
-.context-menu li.open a {
+.context_menu li.open a {
border-bottom-color: transparent;
}
-.context-menu li.open, .context-menu li.closed:hover {
+.context_menu li.open, .context_menu li.closed:hover {
border-top: 1px solid lightgrey;
border-left: 1px solid lightgrey;
border-right: 1px solid grey;
border-bottom-color: transparent;
}
-.context-menu li.closed:hover {
+.context_menu li.closed:hover {
border-bottom-color: grey;
}
-.context-menu li.toplevel span.expand a:active {
+.context_menu li.toplevel span.expand a:active {
border-top: 1px solid white;
border-left: 1px solid white;
border-right: 1px solid grey;
@@ -92,11 +92,11 @@
left: 1px;
}
-.context-menu li ul li {
+.context_menu li ul li {
padding: 0.2em;
}
-.context-menu li.open ul li:hover {
+.context_menu li.open ul li:hover {
background: #eee;
}
Modified: jifty/branches/template-declare/share/web/static/css/forms.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/forms.css (original)
+++ jifty/branches/template-declare/share/web/static/css/forms.css Wed Mar 7 12:37:22 2007
@@ -4,7 +4,7 @@
margin: 0 auto;
}
-div.form-field {
+div.form_field {
clear: both;
padding-top: 0.5em;
}
@@ -14,7 +14,7 @@
float: left;
}
-div.form-field label.label, div.form-field span.label {
+div.form_field label.label, div.form_field span.label {
float: left;
width: 15%;
text-align: right;
@@ -22,7 +22,7 @@
padding: 0.2em 0.5em 0 0;
}
-div.form-field .hints {
+div.form_field .hints {
width: 83%;
font-size: 80%;
padding-top: 0.2em;
@@ -31,13 +31,13 @@
color: #999999;
}
-div.form-field .error, div.form-field .warning, div.form-field .canonicalization_note {
+div.form_field .error, div.form_field .warning, div.form_field .canonicalization_note {
float: right;
width: 88%;
text-align: left;
}
-div.form-field span.formw {
+div.form_field span.formw {
float: right;
width: 88%;
text-align: left;
@@ -61,12 +61,12 @@
width: 10em;
}
-.jifty-submit-button {
+.submit_button {
display: block;
clear: both;
}
-.jifty-submit-button input {
+.submit_button input {
clear: both;
margin: 0.5em 0 0 16%;
}
@@ -86,11 +86,11 @@
be overridden. ".inline" is our inline form class.
*/
-div.inline .submit-button
+div.inline .submit_button
{
}
-div.inline div.form-field {
+div.inline div.form_field {
float: left;
/* to counter previous rules */
@@ -100,8 +100,8 @@
margin-right: 0.5em;
}
-div.inline div.form-field label.label,
-div.inline div.form-field span,
+div.inline div.form_field label.label,
+div.inline div.form_field span,
div.inline .hints,
div.inline .error
{
@@ -119,7 +119,7 @@
}
-div.inline div.form-field label.label {
+div.inline div.form_field label.label {
/* aesthetic */
padding-bottom: 0.1em;
}
@@ -127,19 +127,19 @@
/* So the admin ui is one row per line */
-.jifty-admin.item.inline {
+.jifty_admin.item.inline {
clear: both;
}
-.jifty-admin .editlink {
+.jifty_admin .editlink {
float: right;
}
-.jifty-admin-header {
+.jifty_admin_header {
display: inline;
}
-.jifty-admin-header a {
+.jifty_admin_header a {
color: black;
display: block;
font-size: 0.6em;
@@ -161,14 +161,14 @@
margin-right: 0.2em;
}
-.down-select {
+.down_select {
height : 1.5em;
float: left;
background: url(/static/images/css/bullet_arrow_down.png) no-repeat bottom center;
margin-right: 0.2em;
}
-.down-select a {
+.down_select a {
font-weight: bold;
color: #900;
}
@@ -180,14 +180,14 @@
margin-right: 0.2em;
}
-.up-select {
+.up_select {
height : 1.5em;
float: left;
background: url(/static/images/css/bullet_arrow_up.png) no-repeat bottom center;
margin-right: 0.2em;
}
-.up-select a {
+.up_select a {
font-weight: bold;
color: #900;
}
Modified: jifty/branches/template-declare/share/web/static/css/halos.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/halos.css (original)
+++ jifty/branches/template-declare/share/web/static/css/halos.css Wed Mar 7 12:37:22 2007
@@ -1,10 +1,10 @@
-.halo-actions {
+.halo_actions {
position: fixed;
border: 1px solid black;
background: #ccc;
}
-.halo-actions h1 {
+.halo_actions h1 {
color: #fff;
background-color: #600;
border-bottom: 1px solid black;
@@ -14,11 +14,11 @@
font-size: 120%;
}
-.halo-actions h1 a {
+.halo_actions h1 a {
color: #fff;
}
-.halo-actions .resize {
+.halo_actions .resize {
border: 5px solid #ccc;
border-bottom-color: #000;
border-right-color: #666;
@@ -31,7 +31,7 @@
overflow: hidden;
}
-.halo-actions .section {
+.halo_actions .section {
color: #ccc;
background-color: #300;
border-top: 1px solid black;
@@ -40,46 +40,46 @@
font-weight: bold;
}
-.halo-actions .section a {
+.halo_actions .section a {
text-align: center;
color: #ccc;
}
-.halo-actions .body {
+.halo_actions .body {
font-size: 110%;
margin:0;
padding:0 1em;
}
-.halo-actions .body ul {
+.halo_actions .body ul {
margin:0;
padding:0;
margin-left: 1em;
}
-.halo-actions .body .path {
+.halo_actions .body .path {
font-family: monospace;
font-size: 120%;
text-align: center;
}
-.halo-actions .body .time {
+.halo_actions .body .time {
font-style: italic;
text-align: center;
}
-.halo-actions .body .fixed {
+.halo_actions .body .fixed {
font-family: monospace;
}
-.halo-button {
+.halo_button {
color: yellow;
position: absolute;
z-index: 9999;
font-size:2em;
}
-#jifty-render-info-tree {
+#render_info_tree {
position: fixed;
background: white;
border: 1px solid yellow;
@@ -89,18 +89,18 @@
padding: 1em;
}
-#jifty-render-info-tree ul {
+#render_info_tree ul {
list-style: none;
padding-left: 1em;
}
-#jifty-render-info {
+#render_info {
position: fixed;
right:0.5em;
bottom:0;
}
-a.inline-edit {
+a.inline_edit {
display: block;
width: 0;
@@ -111,7 +111,7 @@
background: url(/static/images/silk/pencil.png) no-repeat 0 0;
}
-a.inline-create {
+a.inline_create {
display: block;
width: 0;
Modified: jifty/branches/template-declare/share/web/static/css/notices.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/notices.css (original)
+++ jifty/branches/template-declare/share/web/static/css/notices.css Wed Mar 7 12:37:22 2007
@@ -1,20 +1,20 @@
/* IE can't handle this nicely w/ AJAX validation */
-html>body .jifty-message {
+html>body .message {
background: url(/static/images/silk/information.png) no-repeat center left;
padding-left: 20px;
}
-html>body .jifty-error {
+html>body .error {
background: url(/static/images/silk/error.png) no-repeat center left;
padding-left: 20px;
}
-.jifty-error {
+.error {
color: #a00000;
}
-div#jifty-messages, div#jifty-errors {
+div#messages, div#errors {
background-color: rgb(240,234,183);
border: 1px solid rgb(230,224,173);
margin-top: 10px;
@@ -24,8 +24,8 @@
position: relative;
}
-#dismiss-jifty-messages,
-#dismiss-jifty-errors
+#dismiss_messages,
+#dismiss_errors
{
padding-left: 16px;
background: url(/static/images/silk/cancel_grey.png) no-repeat;
@@ -36,3 +36,4 @@
display: block;
text-indent: -9999em;
}
+
Modified: jifty/branches/template-declare/share/web/static/js/context_menu.js
==============================================================================
--- jifty/branches/template-declare/share/web/static/js/context_menu.js (original)
+++ jifty/branches/template-declare/share/web/static/js/context_menu.js Wed Mar 7 12:37:22 2007
@@ -11,7 +11,7 @@
Jifty.ContextMenu = {
behaviourRules: {
"ul.menu li.toplevel span.expand a": prepExpandButton,
- "ul.context-menu li.toplevel span.expand a": prepExpandButton
+ "ul.context_menu li.toplevel span.expand a": prepExpandButton
},
currently_open: "",
Modified: jifty/branches/template-declare/share/web/static/js/jifty.js
==============================================================================
--- jifty/branches/template-declare/share/web/static/js/jifty.js (original)
+++ jifty/branches/template-declare/share/web/static/js/jifty.js Wed Mar 7 12:37:22 2007
@@ -475,10 +475,10 @@
Element.addClassName( e, "jifty_enter_handler_attached" );
}
},
- ".jifty-messages": function(e) {
+ ".messages": function(e) {
if ( !Element.hasClassName( e, "jifty_enter_handler_attached" ) ) {
e.innerHTML=
- '<a href="#" id="dismiss-'+e.id+'" title="Dismiss" onmousedown="this.onfocus=this.blur;" onmouseup="this.onfocus=window.clientInformation?null:window.undefined" onclick="Effect.Fade(this.parentNode); return false;">Dismiss</a>' + e.innerHTML;
+ '<a href="#" id="dismiss_'+e.id+'" title="Dismiss" onmousedown="this.onfocus=this.blur;" onmouseup="this.onfocus=window.clientInformation?null:window.undefined" onclick="Effect.Fade(this.parentNode); return false;">Dismiss</a>' + e.innerHTML;
Element.addClassName( e, "jifty_enter_handler_attached" );
}
Modified: jifty/branches/template-declare/share/web/templates/__jifty/error/_elements/wrapper
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/error/_elements/wrapper (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/error/_elements/wrapper Wed Mar 7 12:37:22 2007
@@ -11,7 +11,7 @@
<div id="content">
<a name="content"></a>
% if (Jifty->config->framework('AdminMode') ) {
-<div class="warning admin-mode">
+<div class="warning admin_mode">
Alert: Jifty <% Jifty->web->tangent( label => 'administration mode' , url => '/__jifty/admin/')%> is enabled.
</div>
% }
@@ -27,4 +27,4 @@
This exists as a fallback wrapper, in case the mason error in question
is caused by the Jifty app's wrapper, for instance.
-</%doc>
+</%doc>
\ No newline at end of file
Modified: jifty/branches/template-declare/share/web/templates/__jifty/halo
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/halo (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/halo Wed Mar 7 12:37:22 2007
@@ -1,5 +1,5 @@
-<div><a href="#" id="jifty-render-info" onclick="Element.toggle('jifty-render-info-tree'); return false"><%_('Page info')%></a></div>
-<div style="display: none" id="jifty-render-info-tree">
+<div><a href="#" id="render_info" onclick="Element.toggle('render_info_tree'); return false"><%_('Page info')%></a></div>
+<div style="display: none" id="render_info_tree">
% foreach my $item (@stack) {
% if ( $item->{depth} > $depth ) {
<ul>
@@ -12,7 +12,7 @@
</li>
% }
-<li><a href="#" class="halo-comp-info" onmouseover="halo_over('<% $item->{id} %>')"
+<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $item->{id} %>')"
onmouseout="halo_out('<% $item->{id} %>')"
onclick="halo_toggle('<% $item->{id} %>'); return false;">
<% $item->{'name'} %> - <% $item->{'render_time'} %></a>
@@ -57,7 +57,7 @@
<%def .frame>
-<div class="halo-actions" id="halo-<% $id %>-menu" style="display: none; top: 5px; left: 500px; min-width: 200px; width: 300px; z-index: 5;">
+<div class="halo_actions" id="halo-<% $id %>-menu" style="display: none; top: 5px; left: 500px; min-width: 200px; width: 300px; z-index: 5;">
<h1 id="halo-<% $id %>-title">
<span style="float: right;"><a href="#" onclick="halo_toggle('<% $id %>'); return false">[ X ]</a></span>
<% $frame->{name} %>
@@ -71,7 +71,7 @@
% if ($frame->{parent}) {
<div class="section"><%_('Parent')%></div>
<div class="body"><ul>
-<li><a href="#" class="halo-comp-info" onmouseover="halo_over('<% $frame->{parent}{id} %>')"
+<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $frame->{parent}{id} %>')"
onmouseout="halo_out('<% $frame->{parent}{id} %>')"
onclick="halo_toggle('<% $frame->{parent}{id} %>'); return false;">
<% $frame->{parent}{'path'} %> - <% $frame->{parent}{'render_time'} %></a></li>
@@ -81,7 +81,7 @@
<div class="section"><%_('Children')%></div>
<div class="body"><ul>
% for my $item (@{$frame->{kids}}) {
-<li><a href="#" class="halo-comp-info" onmouseover="halo_over('<% $item->{id} %>')"
+<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $item->{id} %>')"
onmouseout="halo_out('<% $item->{id} %>')"
onclick="halo_toggle('<% $item->{id} %>'); return false;">
<% $item->{'path'} %> - <% $item->{'render_time'} %></a></li>
Modified: jifty/branches/template-declare/share/web/templates/_elements/wrapper
==============================================================================
--- jifty/branches/template-declare/share/web/templates/_elements/wrapper (original)
+++ jifty/branches/template-declare/share/web/templates/_elements/wrapper Wed Mar 7 12:37:22 2007
@@ -7,7 +7,7 @@
<div id="content">
<a name="content"></a>
% if (Jifty->config->framework('AdminMode') ) {
-<div class="jifty-warning admin-mode">
+<div class="warning admin_mode">
<%_('Alert')%>: <% Jifty->web->tangent( label => _('Administration mode is enabled.') , url => '/__jifty/admin/')%>
</div>
% }
More information about the Jifty-commit
mailing list