[Jifty-commit] r2909 - in jifty/trunk: lib/Jifty lib/Jifty/Manual
lib/Jifty/Mason lib/Jifty/Web plugins/EditInPlace/lib/Jifty/Plugin
plugins/Login/share/web/templates share/web/static/css
share/web/static/js share/web/templates/__jifty
share/web/templates/__jifty/admin/fragments/list
share/web/templates/__jifty/error/_elements
share/web/templates/_elements
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Mar 5 10:23:46 EST 2007
Author: hlb
Date: Mon Mar 5 10:23:44 2007
New Revision: 2909
Modified:
jifty/trunk/lib/Jifty/Manual/UsingCSSandJS.pod
jifty/trunk/lib/Jifty/Mason/Halo.pm
jifty/trunk/lib/Jifty/Web.pm
jifty/trunk/lib/Jifty/Web/Form.pm
jifty/trunk/lib/Jifty/Web/Form/Field.pm
jifty/trunk/lib/Jifty/Web/Menu.pm
jifty/trunk/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
jifty/trunk/plugins/Login/share/web/templates/login
jifty/trunk/share/web/static/css/base.css
jifty/trunk/share/web/static/css/context-menus.css
jifty/trunk/share/web/static/css/forms.css
jifty/trunk/share/web/static/css/halos.css
jifty/trunk/share/web/static/css/notices.css
jifty/trunk/share/web/static/js/context_menu.js
jifty/trunk/share/web/static/js/jifty.js
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view
jifty/trunk/share/web/templates/__jifty/error/_elements/wrapper
jifty/trunk/share/web/templates/__jifty/halo
jifty/trunk/share/web/templates/_elements/wrapper
Log:
Changes in id & class name. Please check your own css rules before update.
- use hyphen instead of underscore for consistency
- add "jifty-" to avoid conflicting with users' apps ( suggested by jpollack )
id & class name affected:
admin_mode, canonicalization_note, context_menu, dismiss_error, dismiss_messages, down_select, error, errors, form_field, halo_actions, halo_button, halo_comp_info, inline_create, inline_edit, jifty_admin, jifty_admin_header, message, messages, render_info, render_info_tree, submit_button, submit_button, up_select, warning
Modified: jifty/trunk/lib/Jifty/Manual/UsingCSSandJS.pod
==============================================================================
--- jifty/trunk/lib/Jifty/Manual/UsingCSSandJS.pod (original)
+++ jifty/trunk/lib/Jifty/Manual/UsingCSSandJS.pod Mon Mar 5 10:23:44 2007
@@ -92,7 +92,7 @@
=item widget, button, button_as_link, combobox,
combo-text, combo-button, combo-list, date, label, password
-submit_button, reset, text, hidden, ajaxvalidation,
+jifty-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/trunk/lib/Jifty/Mason/Halo.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Mason/Halo.pm (original)
+++ jifty/trunk/lib/Jifty/Mason/Halo.pm Mon Mar 5 10:23:44 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/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm (original)
+++ jifty/trunk/lib/Jifty/Web.pm Mon Mar 5 10:23:44 2007
@@ -871,12 +871,12 @@
return unless grep {$_->$type()} values %results;
- my $plural = $type . "s";
- $self->out(qq{<div class="jifty results messages" id="$plural">});
+ my $plural = "jifty-" . $type . "s";
+ $self->out(qq{<div class="jifty results jifty-messages" id="$plural">});
foreach my $moniker ( sort keys %results ) {
if ( $results{$moniker}->$type() ) {
- $self->out( qq{<div class="$type $moniker">}
+ $self->out( qq{<div class="jifty-$type $moniker">}
. $results{$moniker}->$type()
. qq{</div>} );
}
Modified: jifty/trunk/lib/Jifty/Web/Form.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Form.pm Mon Mar 5 10:23:44 2007
@@ -212,7 +212,7 @@
my $self = shift;
my $button = Jifty::Web::Form::Clickable->new(submit => undef, @_)->generate;
- Jifty->web->out(qq{<div class="submit_button">});
+ Jifty->web->out(qq{<div class="jifty-submit-button">});
$button->render_widget;
Jifty->web->out(qq{</div>});
Modified: jifty/trunk/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field.pm Mon Mar 5 10:23:44 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/trunk/lib/Jifty/Web/Menu.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Menu.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Menu.pm Mon Mar 5 10:23:44 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/trunk/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
==============================================================================
--- jifty/trunk/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm (original)
+++ jifty/trunk/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm Mon Mar 5 10:23:44 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/trunk/plugins/Login/share/web/templates/login
==============================================================================
--- jifty/trunk/plugins/Login/share/web/templates/login (original)
+++ jifty/trunk/plugins/Login/share/web/templates/login Mon Mar 5 10:23:44 2007
@@ -10,7 +10,7 @@
<% $action->form_field('email') %>
<% $action->form_field('password') %>
<% $action->form_field('remember') %>
-<div class="submit_button">
+<div class="jifty-submit-button">
<% Jifty->web->return(label => _('Login'), to => '/', submit => $action) %>
</div>
<% Jifty->web->form->end %>
Modified: jifty/trunk/share/web/static/css/base.css
==============================================================================
--- jifty/trunk/share/web/static/css/base.css (original)
+++ jifty/trunk/share/web/static/css/base.css Mon Mar 5 10:23:44 2007
@@ -4,7 +4,7 @@
body.calpopup {
}
-.error {
+.jifty-error {
color: #a00000;
}
@@ -12,7 +12,7 @@
color: #00a0a0;
}
-.canonicalization_note {
+.canonicalization-note {
color: #009966;
}
@@ -20,11 +20,11 @@
clear: both;
}
-.messages .message {
+.jifty-messages .jifty-message {
display: block;
}
-div#messages, div#errors {
+div#jifty-messages, div#jifty-errors {
background-color: rgb(240,234,183);
border: 1px solid rgb(230,224,173);
margin-top: 10px;
@@ -62,7 +62,7 @@
-div.warning {
+div.jifty-warning {
position: absolute;
top: 0;
left: 0;
@@ -74,7 +74,7 @@
border-bottom: 1px solid #000;
}
-div.warning a {
+div.jifty-warning a {
color: white;
}
Modified: jifty/trunk/share/web/static/css/context-menus.css
==============================================================================
--- jifty/trunk/share/web/static/css/context-menus.css (original)
+++ jifty/trunk/share/web/static/css/context-menus.css Mon Mar 5 10:23:44 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/trunk/share/web/static/css/forms.css
==============================================================================
--- jifty/trunk/share/web/static/css/forms.css (original)
+++ jifty/trunk/share/web/static/css/forms.css Mon Mar 5 10:23:44 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;
}
-.submit_button {
+.jifty-submit-button {
display: block;
clear: both;
}
-.submit_button input {
+.jifty-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/trunk/share/web/static/css/halos.css
==============================================================================
--- jifty/trunk/share/web/static/css/halos.css (original)
+++ jifty/trunk/share/web/static/css/halos.css Mon Mar 5 10:23:44 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;
}
-#render_info_tree {
+#jifty-render-info-tree {
position: fixed;
background: white;
border: 1px solid yellow;
@@ -89,18 +89,18 @@
padding: 1em;
}
-#render_info_tree ul {
+#jifty-render-info-tree ul {
list-style: none;
padding-left: 1em;
}
-#render_info {
+#jifty-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/trunk/share/web/static/css/notices.css
==============================================================================
--- jifty/trunk/share/web/static/css/notices.css (original)
+++ jifty/trunk/share/web/static/css/notices.css Mon Mar 5 10:23:44 2007
@@ -1,20 +1,20 @@
/* IE can't handle this nicely w/ AJAX validation */
-html>body .message {
+html>body .jifty-message {
background: url(/static/images/silk/information.png) no-repeat center left;
padding-left: 20px;
}
-html>body .error {
+html>body .jifty-error {
background: url(/static/images/silk/error.png) no-repeat center left;
padding-left: 20px;
}
-.error {
+.jifty-error {
color: #a00000;
}
-div#messages, div#errors {
+div#jifty-messages, div#jifty-errors {
background-color: rgb(240,234,183);
border: 1px solid rgb(230,224,173);
margin-top: 10px;
@@ -24,8 +24,8 @@
position: relative;
}
-#dismiss_messages,
-#dismiss_errors
+#dismiss-jifty-messages,
+#dismiss-jifty-errors
{
padding-left: 16px;
background: url(/static/images/silk/cancel_grey.png) no-repeat;
@@ -36,4 +36,3 @@
display: block;
text-indent: -9999em;
}
-
Modified: jifty/trunk/share/web/static/js/context_menu.js
==============================================================================
--- jifty/trunk/share/web/static/js/context_menu.js (original)
+++ jifty/trunk/share/web/static/js/context_menu.js Mon Mar 5 10:23:44 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/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js (original)
+++ jifty/trunk/share/web/static/js/jifty.js Mon Mar 5 10:23:44 2007
@@ -178,7 +178,7 @@
for (var field = action.firstChild; field != null; field = field.nextSibling) {
// Possibilities for field.nodeName: it could be 'ignored', 'blank' , 'update', or 'info'
// info is a separate action from the update
- if (field.nodeName == 'canonicalization_note') {
+ if (field.nodeName == 'canonicalization-note') {
var note_div= document.getElementById(field.getAttribute("id"));
if (note_div != null) {
note_div.innerHTML = field.firstChild.data;
@@ -475,7 +475,7 @@
Element.addClassName( e, "jifty_enter_handler_attached" );
}
},
- ".messages": function(e) {
+ ".jifty-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;
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header Mon Mar 5 10:23:44 2007
@@ -11,12 +11,12 @@
my $record = $record_class->new();
my $update = Jifty->web->new_action(class => 'Update'.$object_type);
</%init>
-<div class="jifty_admin_header">
+<div class="jifty-admin-header">
% foreach my $argument ($update->argument_names) {
% unless( $argument eq $mask_field || $argument eq 'id' || $argument =~ /_confirm$/i
% && lc $update->arguments->{$argument}{render_as} eq 'password') {
-<span class="<% ($sort_by && !$order && $sort_by eq $argument)?'up_select':'up' %>">
+<span class="<% ($sort_by && !$order && $sort_by eq $argument)?'up-select':'up' %>">
<%
Jifty->web->link(
label => _("asc"),
@@ -35,7 +35,7 @@
#as_button => 1
)
%></span>
-<span class="<% ($sort_by && $order && $sort_by eq $argument )?'down_select':'down' %>">
+<span class="<% ($sort_by && $order && $sort_by eq $argument )?'down-select':'down' %>">
<%
Jifty->web->link(
label => _("desc"),
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item Mon Mar 5 10:23:44 2007
@@ -12,7 +12,7 @@
% if ($mask_field) {
<% $create->hidden($mask_field,$mask_val) %>
% }
-<div class="jifty_admin create item inline">
+<div class="jifty-admin create item inline">
% foreach my $argument ($create->argument_names) {
% if ( $argument ne $mask_field ) {
<%$create->form_field($argument)%>
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search Mon Mar 5 10:23:44 2007
@@ -9,7 +9,7 @@
);
</%init>
-<div class="jifty_admin">
+<div class="jifty-admin">
% for my $arg ($search->argument_names) {
<% $search->form_field($arg) %>
% }
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update Mon Mar 5 10:23:44 2007
@@ -15,7 +15,7 @@
record => $record
);
</%init>
-<div class="jifty_admin update item inline <%$object_type%>">
+<div class="jifty-admin update item inline <%$object_type%>">
<div class="editlink">
<% Jifty->web->link(
label => _('Save'),
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view Mon Mar 5 10:23:44 2007
@@ -21,7 +21,7 @@
);
</%init>
-<div class="jifty_admin read item inline">
+<div class="jifty-admin read item inline">
<%
Jifty->web->form->submit(
Modified: jifty/trunk/share/web/templates/__jifty/error/_elements/wrapper
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/error/_elements/wrapper (original)
+++ jifty/trunk/share/web/templates/__jifty/error/_elements/wrapper Mon Mar 5 10:23:44 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>
\ No newline at end of file
+</%doc>
Modified: jifty/trunk/share/web/templates/__jifty/halo
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/halo (original)
+++ jifty/trunk/share/web/templates/__jifty/halo Mon Mar 5 10:23:44 2007
@@ -1,5 +1,5 @@
-<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">
+<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">
% 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/trunk/share/web/templates/_elements/wrapper
==============================================================================
--- jifty/trunk/share/web/templates/_elements/wrapper (original)
+++ jifty/trunk/share/web/templates/_elements/wrapper Mon Mar 5 10:23:44 2007
@@ -7,7 +7,7 @@
<div id="content">
<a name="content"></a>
% if (Jifty->config->framework('AdminMode') ) {
-<div class="warning admin_mode">
+<div class="jifty-warning admin-mode">
<%_('Alert')%>: <% Jifty->web->tangent( label => _('Administration mode is enabled.') , url => '/__jifty/admin/')%>
</div>
% }
More information about the Jifty-commit
mailing list