![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png){kind=small}
[dw-free] Revamp /update
[commit: http://hg.dwscoalition.org/dw-free/rev/5f87391fecc9]
http://bugs.dwscoalition.org/show_bug.cgi?id=2524
Tweaks, mostly to coding style for code clarity and i18n.
Patch by![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
fu.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=2524
Tweaks, mostly to coding style for code clarity and i18n.
Patch by
fu.Files modified:
- bin/upgrading/en.dat
- cgi-bin/DW/Controller/Entry.pm
- cgi-bin/LJ/User.pm
- t/post.t
- views/entry/form.tt
- views/entry/module-access.tt
- views/entry/module-access.tt.text
- views/entry/module-age_restriction.tt
- views/entry/module-age_restriction.tt.text
- views/entry/module-comments-new.tt
- views/entry/module-comments.tt
- views/entry/module-crosspost.tt
- views/entry/module-crosspost.tt.text
- views/entry/module-currents.tt
- views/entry/module-currents.tt.text
- views/entry/module-displaydate.tt
- views/entry/module-icons.tt
- views/entry/module-journal.tt
- views/entry/module-journal.tt.text
- views/entry/module-scheduled.tt
- views/entry/module-status.tt
- views/entry/module-tags.tt
- views/entry/module-tags.tt.text
- views/entry/options.tt
- views/entry/preview.tt
- views/entry/success.tt
--------------------------------------------------------------------------------
diff -r 19ee4d760084 -r 5f87391fecc9 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Mon Dec 05 21:10:12 2011 +0800
+++ b/bin/upgrading/en.dat Mon Dec 05 22:31:48 2011 +0800
@@ -3697,6 +3697,8 @@
subscribe_interface.unavailable_subs.note=These notification options are only available to certain account types.
+success=Success
+
support.answertype.answer=Answer
support.answertype.bounce=Bounce to Email & Close
@@ -3795,8 +3797,6 @@
support.email.update.unknown_username=[Unknown or undefined example username]
-success=Success
-
taglib.error.access=You are not allowed to tag entries in this journal.
taglib.error.add=You are not allowed to create new tags for this journal; the entry was not tagged with [[tags]].
diff -r 19ee4d760084 -r 5f87391fecc9 cgi-bin/DW/Controller/Entry.pm
--- a/cgi-bin/DW/Controller/Entry.pm Mon Dec 05 21:10:12 2011 +0800
+++ b/cgi-bin/DW/Controller/Entry.pm Mon Dec 05 22:31:48 2011 +0800
@@ -2,7 +2,7 @@
#
# DW::Controller::Entry
#
-# This controller is for the create entry page
+# This controller is for creating and managing entries
#
# Authors:
# Afuna <coder.dw@afunamatata.com>
@@ -41,8 +41,8 @@
DW::Routing->register_string( '/entry/preview', \&preview_handler, app => 1, methods => { POST => 1 } );
-DW::Routing->register_string( '/entry/options', \&options_handler, app => 1, format => "html" );
-DW::Routing->register_string( '/__rpc_entryoptions', \&options_rpc_handler, app => 1, format => "html" );
+DW::Routing->register_string( '/entry/options', \&options_handler, app => 1 );
+DW::Routing->register_string( '/__rpc_entryoptions', \&options_rpc_handler, app => 1 );
# /entry/username/ditemid/edit
#DW::Routing->register_regex( '^/entry/(?:(.+)/)?(\d+)/edit$', \&edit_handler, app => 1 );
@@ -87,7 +87,6 @@
my $okay_formauth = ! $remote || LJ::check_form_auth( $post->{lj_form_auth} );
- # ... but see TODO below
push @error_list, LJ::Lang::ml( "error.invalidform" )
unless $okay_formauth;
@@ -180,13 +179,15 @@
my $get = $r->get_args;
$usejournal ||= $get->{usejournal};
- my $vars = init( { usejournal => $usejournal,
+ my $vars = _init( { usejournal => $usejournal,
altlogin => $get->{altlogin},
datetime => $datetime || "",
trust_datetime_value => $trust_datetime_value,
}, @_ );
- # these kinds of errors prevent us from initiating the form at all
+ return $vars->{ret} if $vars->{handled};
+
+ # these kinds of errors prevent us from initializing the form at all
# so abort and return it without the form
return error_ml( $vars->{abort}, $vars->{args} )
if $vars->{abort};
@@ -217,31 +218,20 @@
}
-=head2 C<< DW::Controller::Entry::init( ) >>
-
-Initializes entry form values.
-
-Can be used when posting a new entry or editing an old entry. .
-
-Arguments:
-* form_opts: options for initializing the form
-=over
-
-=item altlogin bool: whether we are posting as someone other than the currently logged in user
-=item usejournal string: username of the journal we're posting to (if not provided,
- use journal of the user we're posting as)
-=item datetime string: display date of the entry in format "$year-$mon-$mday $hour:$min" (already taking into account timezones)
-
-=back
-
-* call_opts: instance of DW::Routing::CallInfo
-
-=cut
-sub init {
+# Initializes entry form values.
+# Can be used when posting a new entry or editing an old entry. .
+# Arguments:
+# * form_opts: options for initializing the form
+# altlogin bool: whether we are posting as someone other than the currently logged in user
+# usejournal string: username of the journal we're posting to (if not provided,
+# use journal of the user we're posting as)
+# datetime string: display date of the entry in format "$year-$mon-$mday $hour:$min" (already taking into account timezones)
+# * call_opts: instance of DW::Routing::CallInfo (currently unused)
+sub _init {
my ( $form_opts, $call_opts ) = @_;
my ( $ok, $rv ) = controller( anonymous => 1 );
- return $rv unless $ok;
+ return { handled => 1, ret => $rv } unless $ok;
my $post_as_other = $form_opts->{altlogin} ? 1 : 0;
my $u = $post_as_other ? undef : $rv->{remote};
@@ -871,13 +861,10 @@
# determine style system to preview with
- my $forceflag = 0;
- LJ::Hooks::run_hooks( "force_s1", $u, \$forceflag );
-
$ctx = LJ::S2::s2_context( $u->{s2_style} );
my $view_entry_disabled = ! LJ::S2::use_journalstyle_entry_page( $u, $ctx );
- if ( $forceflag || $view_entry_disabled ) {
+ if ( $view_entry_disabled ) {
# force site-skinned
( $siteskinned, $styleid ) = ( 1, 0 );
} else {
@@ -1105,16 +1092,13 @@
my $u = $_[0];
my $panel_element_name = "visible_panels";
- my @panel_options;
- foreach ( qw( access comments age_restriction journal crosspost
- icons tags currents displaydate ) ) {
- push @panel_options, {
- label_ml => "/entry/module-$_.tt.header",
- panel_name => $_,
- id => "panel_$_",
- name => $panel_element_name,
- }
- }
+ my @panel_options = map +{
+ label_ml => "/entry/module-$_.tt.header",
+ panel_name => $_,
+ id => "panel_$_",
+ name => $panel_element_name, },
+ qw( access comments age_restriction journal
+ crosspost icons tags currents displaydate );
my $vars = {
panels => \@panel_options
diff -r 19ee4d760084 -r 5f87391fecc9 cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm Mon Dec 05 21:10:12 2011 +0800
+++ b/cgi-bin/LJ/User.pm Mon Dec 05 22:31:48 2011 +0800
@@ -4752,7 +4752,7 @@
}
sub entryform_width {
- my ( $u, $prop ) = @_;
+ my ( $u ) = @_;
if ( $u->raw_prop( 'entryform_width' ) =~ /^(F|P)$/ ) {
return $u->raw_prop( 'entryform_width' )
diff -r 19ee4d760084 -r 5f87391fecc9 t/post.t
--- a/t/post.t Mon Dec 05 21:10:12 2011 +0800
+++ b/t/post.t Mon Dec 05 22:31:48 2011 +0800
@@ -30,7 +30,7 @@
note( "Not logged in - init" );
{
- my $vars = DW::Controller::Entry::init();
+ my $vars = DW::Controller::Entry::_init();
# user
ok( ! $vars->{remote} );
@@ -53,7 +53,7 @@
LJ::set_remote( $u );
my $vars;
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
ok( $u->equals( $vars->{remote} ), "Post done as currently logged in user." );
@@ -68,7 +68,7 @@
$icon1->set_keywords( "b, z" );
$icon2->set_keywords( "a, c, y" );
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( @{$vars->{icons}}, 6, "Has icons (including a blank one in the list for default)" );
ok( ! $vars->{defaulticon}, "No default icon." );
@@ -95,7 +95,7 @@
note( " with default icon" );
$icon1->make_default;
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
ok( $vars->{defaulticon}, "Has default icon." );
$icon_order[0] = [ undef, $icon1 ];
@@ -109,7 +109,7 @@
note( "# Moodtheme" );
note( " default mood theme" );
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
my $moods = DW::Mood->get_moods;
ok( $vars->{moodtheme}->{id} == $LJ::USER_INIT{moodthemeid}, "Default mood theme." );
@@ -119,7 +119,7 @@
$u->update_self( { moodthemeid => undef } );
$u = LJ::load_user($u->user, 'force');
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
ok( ! %{ $vars->{moodtheme} }, "No mood theme." );
note( " custom mood theme with incomplete moods" );
@@ -133,7 +133,7 @@
my $err;
$customtheme->set_picture( $testmoodid, { picurl => "http://example.com/moodpic", width => 10, height => 20 }, \$err );
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( $vars->{moodtheme}->{id}, $customtheme->id, "Custom mood theme." );
is( scalar keys %{$vars->{moodtheme}->{pics}}, 1, "Only provide picture information for moods with valid pictures." );
is( $vars->{moodtheme}->{pics}->{$testmoodid}->{pic}, "http://example.com/moodpic", "Confirm picture URL matches." );
@@ -142,7 +142,7 @@
is( $vars->{moodtheme}->{pics}->{$testmoodid}->{name}, $moods->{$testmoodid}->{name}, "Confirm mood name matches.");
note( "Security levels ");
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( scalar @{$vars->{security}}, 3, "Basic security levels" );
is( $vars->{security}->[0]->{label}, LJ::Lang::ml( 'label.security.public2' ), "Public security" );
is( $vars->{security}->[0]->{value}, "public", "Public security" );
@@ -152,7 +152,7 @@
is( $vars->{security}->[2]->{value}, "private", "Private security" );
$u->create_trust_group( groupname => "test" );
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( scalar @{$vars->{security}}, 4, "Security with custom groups" );
is( $vars->{security}->[0]->{label}, LJ::Lang::ml( 'label.security.public2' ), "Public security" );
is( $vars->{security}->[0]->{value}, "public", "Public security" );
@@ -168,7 +168,7 @@
note( "# Usejournal" );
note( " No communities." );
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( scalar @{$vars->{journallist}}, 1, "One journal (yourself)" );
ok( $vars->{journallist}->[0]->equals( $u ), "First journal in the list is yourself." );
@@ -179,7 +179,7 @@
$u->join_community( $comm_nopost, 1, 0 );
note( " With communities." );
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( scalar @{$vars->{journallist}}, 2, "Yourself and one community." );
ok( $vars->{journallist}->[0]->equals( $u ), "First journal in the list is yourself." );
ok( $vars->{journallist}->[1]->equals( $comm_canpost ), "Second journal in the list is a community you can post to." );
@@ -196,7 +196,7 @@
$u->join_community( $comm_nopost, 1, 0 );
note( " With usejournal argument (can post)" );
- my $vars = DW::Controller::Entry::init( { usejournal => $comm_canpost->user } );
+ my $vars = DW::Controller::Entry::_init( { usejournal => $comm_canpost->user } );
is( scalar @{$vars->{journallist}}, 1, "Usejournal." );
ok( $vars->{journallist}->[0]->equals( $comm_canpost ), "Only item in the list is usejournal value." );
ok( $vars->{usejournal}->equals( $comm_canpost ), "Usejournal argument." );
@@ -219,7 +219,7 @@
# allow this, because the user can still log in as another user in order to complete the post
note( " With usejournal argument (cannot post)" );
- $vars = DW::Controller::Entry::init( { usejournal => $comm_nopost->user } );
+ $vars = DW::Controller::Entry::_init( { usejournal => $comm_nopost->user } );
is( scalar @{$vars->{journallist}}, 1, "Usejournal." );
ok( $vars->{journallist}->[0]->equals( $comm_nopost ), "Only item in the list is usejournal value." );
ok( $vars->{usejournal}->equals( $comm_nopost ), "Usejournal argument." );
@@ -231,7 +231,7 @@
my $alt = temp_user();
LJ::set_remote( $u );
- my $vars = DW::Controller::Entry::init( { altlogin => 1 } );
+ my $vars = DW::Controller::Entry::_init( { altlogin => 1 } );
ok( ! $vars->{remote}, "Altlogin means form has no remote" );
ok( ! $vars->{poster}, "\$alt doesn't show up in the form on init" );
@@ -571,7 +571,7 @@
LJ::set_remote( $u );
my $vars;
- $vars = DW::Controller::Entry::init();
+ $vars = DW::Controller::Entry::_init();
is( $vars->{abort}, "/update.bml.error.nonusercantpost" );
}
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/form.tt
--- a/views/entry/form.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/form.tt Mon Dec 05 22:31:48 2011 +0800
@@ -5,6 +5,8 @@
Authors:
Afuna <coder.dw@afunamatata.com>
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
This program is free software; you may redistribute it and/or modify it under
the same terms as Perl itself. For a copy of the license, please reference
'perldoc perlartistic' or 'perldoc perlgpl'.
@@ -12,12 +14,12 @@
[%- CALL dw.active_resource_group( "jquery" ) -%]
-[% dw.need_res(
- "stc/postform.css",
+[%- dw.need_res(
+ "stc/postform.css"
"stc/postform-resize.css"
-) %]
+) -%]
-[% dw.need_res( { group => "jquery" },
+[%- dw.need_res( { group => "jquery" },
# jquery ui
"js/jquery/jquery.ui.core.js"
"js/jquery/jquery.ui.widget.js"
@@ -52,13 +54,14 @@
# page-specific
"js/jquery.postform.js"
-) %]
+) -%]
-[% IF remote && remote.can_use_userpic_select;
-dw.need_res( { group => "jquery" },
- "js/jquery.iconselector.js"
- "stc/jquery.iconselector.css"
-); END %]
+[%- IF remote && remote.can_use_userpic_select;
+ dw.need_res( { group => "jquery" },
+ "js/jquery.iconselector.js"
+ "stc/jquery.iconselector.css"
+ );
+END -%]
[% sections.title = '.title' | ml %]
[% sections.contentopts = '' %]
@@ -114,7 +117,7 @@
postFormInitData.minAnimation = [% min_animation ? "true" : "false" %];
</script>
-[% END %]
+[% END # sections.head %]
<div class="message-box ui-state-highlight">[% ".beta.on" | ml( aopts = "href='$site.root/betafeatures'", user = betacommunity.ljuser_display ) %]</div>
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-access.tt
--- a/views/entry/module-access.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-access.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-access.tt
+
+Module for security in the entry form
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
<fieldset>
<h3>[% ".header" | ml %]</h3>
<div class="inner">
@@ -8,7 +22,7 @@
END;
-%]
[%- label = ".label" | ml;
- form.select( label = "$label:"
+ form.select( label = label
name = "security"
id = "security"
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-access.tt.text
--- a/views/entry/module-access.tt.text Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-access.tt.text Mon Dec 05 22:31:48 2011 +0800
@@ -3,4 +3,4 @@
.header.custom=Custom Access Groups
-.label=Level
+.label=Level:
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-age_restriction.tt
--- a/views/entry/module-age_restriction.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-age_restriction.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-age_restriction.tt
+
+Module for age restriction level in the entry form
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
<fieldset>
<h3>[% ".header" | ml %]</h3>
<div class='inner'>
@@ -18,7 +32,7 @@
END
-%]
[%- label = ".label.age_restriction" | ml;
- form.select( label = "$label:"
+ form.select( label = label
name = "age_restriction"
id = "age_restriction"
@@ -29,7 +43,7 @@
</p>
<p>
[%- label = ".label.age_restriction_reason" | ml;
- form.textbox( label = "$label:"
+ form.textbox( label = label
name = "age_restriction_reason"
id = "age_restriction_reason"
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-age_restriction.tt.text
--- a/views/entry/module-age_restriction.tt.text Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-age_restriction.tt.text Mon Dec 05 22:31:48 2011 +0800
@@ -1,9 +1,9 @@
;; -*- coding: utf-8 -*-
.header=Age Restriction
-.label.age_restriction=Level
+.label.age_restriction=Level:
-.label.age_restriction_reason=Reason
+.label.age_restriction_reason=Reason:
.option.adultcontent.default=Journal Default
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-comments-new.tt
--- a/views/entry/module-comments-new.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-comments-new.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-comments-new.tt
+
+Proposed new module for comments
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
<fieldset class="comments_settings">
<h3>Comment Settings</h3>
<div class='inner'>
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-comments.tt
--- a/views/entry/module-comments.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-comments.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,5 +1,18 @@
-[%# old implementation for comments just to show people where things are
-; will be phased out for new implementation %]
+[%# views/entry/module-comments.tt
+
+Old implementation for comments just to show people where things are;
+will be phased out for new implementation
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
<fieldset class="comments_settings">
<h3>[% ".header" | ml %]</h3>
<div class='inner'>
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-crosspost.tt
--- a/views/entry/module-crosspost.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-crosspost.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,18 @@
+[%# views/entry/module-crosspost.tt
+
+Module to control crosspost behavior
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+%]
+
+
[% IF remote %]
<fieldset>
<h3>[% ".header" | ml %]</h3>
@@ -39,7 +54,7 @@
[% IF account.need_password %]
<div class="crosspost_password_container" id="crosspost_password_container_[% account.id %]">
- [%- form.password( label = "$crosspost_password_label:"
+ [%- form.password( label = crosspost_password_label
name = "crosspost_password_$account.id"
id = "crosspost_password_$account.id"
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-crosspost.tt.text
--- a/views/entry/module-crosspost.tt.text Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-crosspost.tt.text Mon Dec 05 22:31:48 2011 +0800
@@ -5,6 +5,6 @@
.label.crosspost_entry=Crosspost this entry
-.label.password=Password
+.label.password=Password:
.settings.link=go to settings
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-currents.tt
--- a/views/entry/module-currents.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-currents.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,16 @@
+[%# views/entry/module-currents.tt
+
+Module for currents / metadata in the entry form
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
<fieldset>
<h3>[% ".header" | ml %]</h3>
<div class='inner'>
@@ -8,7 +21,7 @@
END
-%]
[%- label = ".label.current_mood" | ml;
- form.select( label = "$label:"
+ form.select( label = label
name = "current_mood"
id = "current_mood"
@@ -19,7 +32,7 @@
</p>
<p>
[%- label = ".label.current_mood_other" | ml;
- form.textbox( label = "$label:"
+ form.textbox( label = label
name = "current_mood_other"
id = "current_mood_other"
@@ -29,7 +42,7 @@
</p>
<p>
[%- label = ".label.current_music" | ml;
- form.textbox( label = "$label:"
+ form.textbox( label = label
name = "current_music"
id = "current_music"
@@ -39,7 +52,7 @@
</p>
<p>
[%- label = ".label.current_location" | ml;
- form.textbox( label = "$label:"
+ form.textbox( label = label
name = "current_location"
id = "current_location"
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-currents.tt.text
--- a/views/entry/module-currents.tt.text Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-currents.tt.text Mon Dec 05 22:31:48 2011 +0800
@@ -1,10 +1,10 @@
;; -*- coding: utf-8 -*-
.header=Currents
-.label.current_location=Location
+.label.current_location=Location:
-.label.current_mood=Mood
+.label.current_mood=Mood:
-.label.current_mood_other=Custom Mood
+.label.current_mood_other=Custom Mood:
-.label.current_music=Music
+.label.current_music=Music:
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-displaydate.tt
--- a/views/entry/module-displaydate.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-displaydate.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,16 @@
+[%# views/entry/module-displaydate.tt
+
+Module for display date in the entry form
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
<fieldset>
<h3>[% ".header" | ml %]</h3>
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-icons.tt
--- a/views/entry/module-icons.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-icons.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-icons.tt
+
+Module for icons in the entry form
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
[% IF remote %]
<fieldset>
<h3>[% ".header" | ml %]</h3>
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-journal.tt
--- a/views/entry/module-journal.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-journal.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-journal.tt
+
+Module for the journal we're posting as/to
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+%]
+
<fieldset>
<h3>[% ".header" | ml %]</h3>
<div class="inner">
@@ -5,7 +19,7 @@
<div id="post_as">
[% IF remote %]
<fieldset>
- <legend><span>[% ".label.post_as" | ml %]:</span></legend>
+ <legend><span>[% ".label.post_as" | ml %]</span></legend>
[%-
form.radio( label = remote.user
name = "post_as"
@@ -39,7 +53,7 @@
[% IF remote %]
<div id="post_to" class="posting_settings">
- <label for="usejournal">[%- ".label.post_to" | ml %]:</label>
+ <label for="usejournal">[%- ".label.post_to" | ml %]</label>
[%- IF journallist.size > 1 %]
[%-
journalselect = [];
@@ -72,20 +86,20 @@
<ul>
<li>
[%- postas_username_label = ".label.post_as_username" | ml;
- form.textbox( label = "$postas_username_label:"
+ form.textbox( label = postas_username_label
name = "username"
id = "post_username"
) -%]
</li>
<li>
[%- postas_password_label = ".label.post_as_password" | ml;
- form.password( label = "$postas_password_label:"
+ form.password( label = postas_password_label
name = "password"
id = "password"
) -%]
</li>
<li>
- <label for="postas_usejournal">[% ".label.post_to" | ml %]:</label>
+ <label for="postas_usejournal">[% ".label.post_to" | ml %]</label>
[% IF usejournal %]
[% usejournal.ljuser_display %]
[% ELSE %]
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-journal.tt.text
--- a/views/entry/module-journal.tt.text Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-journal.tt.text Mon Dec 05 22:31:48 2011 +0800
@@ -3,12 +3,12 @@
.header.post_as=Posting as User
-.label.post_as=Post as
+.label.post_as=Post as:
.label.post_as_other=another user
-.label.post_as_password=Password
+.label.post_as_password=Password:
-.label.post_as_username=Username
+.label.post_as_username=Username:
-.label.post_to= Post to
+.label.post_to= Post to:
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-scheduled.tt
--- a/views/entry/module-scheduled.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-scheduled.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-scheduled.tt
+
+Module for scheduling entries
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+%]
+
<fieldset>
<h3>Scheduled Publishing</h3>
<div class="inner">
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-status.tt
--- a/views/entry/module-status.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-status.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/module-status.tt
+
+Module for entry status
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+%]
+
<fieldset>
<h3>Status</h3>
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-tags.tt
--- a/views/entry/module-tags.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-tags.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,8 +1,22 @@
+[%# views/entry/module-tags.tt
+
+Module for tags in the entry form
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
<fieldset>
<h3>[% ".header" | ml %]</h3>
<div class="inner">
[%- label = ".label.tags" | ml;
- form.textarea( label = "$label:"
+ form.textarea( label = label
id = "taglist"
name = "taglist"
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/module-tags.tt.text
--- a/views/entry/module-tags.tt.text Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/module-tags.tt.text Mon Dec 05 22:31:48 2011 +0800
@@ -1,6 +1,6 @@
;; -*- coding: utf-8 -*-
.header=Tags
-.label.tags=Tags (comma separated)
+.label.tags=Tags (comma separated):
.link.tagspage=go to journal tags
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/options.tt
--- a/views/entry/options.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/options.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,10 +1,12 @@
-[%# post/options.tt
+[%# views/entry/options.tt
Page to edit options for the post entry page
Authors:
Afuna <coder.dw@afunamatata.com>
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
This program is free software; you may redistribute it and/or modify it under
the same terms as Perl itself. For a copy of the license, please reference
'perldoc perlartistic' or 'perldoc perlgpl'.
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/preview.tt
--- a/views/entry/preview.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/preview.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,10 +1,12 @@
-[%# post-preview.tt
+[%# views/entry/preview.tt
Page to preview entries in site skin
Authors:
Afuna <coder.dw@afunamatata.com>
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
This program is free software; you may redistribute it and/or modify it under
the same terms as Perl itself. For a copy of the license, please reference
'perldoc perlartistic' or 'perldoc perlgpl'.
diff -r 19ee4d760084 -r 5f87391fecc9 views/entry/success.tt
--- a/views/entry/success.tt Mon Dec 05 21:10:12 2011 +0800
+++ b/views/entry/success.tt Mon Dec 05 22:31:48 2011 +0800
@@ -1,3 +1,17 @@
+[%# views/entry/success.tt
+
+Page shown upon successful form submission
+
+Authors:
+ Afuna <coder.dw@afunamatata.com>
+
+Copyright (c) 2011 by Dreamwidth Studios, LLC.
+
+This program is free software; you may redistribute it and/or modify it under
+the same terms as Perl itself. For a copy of the license, please reference
+'perldoc perlartistic' or 'perldoc perlgpl'.
+-%]
+
[%- sections.title = 'success' | ml -%]
[%- IF warnings.size > 0 -%]
--------------------------------------------------------------------------------