Change user-facing text to refer to the user layer as a "wizard" layer,
to emphasize what the layer is for. Internal code references are not changed.
Patch by draigwen.
diffs (172 lines):
diff -r f00ab7d12a40 -r 9068a8bb8958 doc/raw/s2/lj/quickstart.xml
--- a/doc/raw/s2/lj/quickstart.xml Thu Dec 17 14:43:41 2009 +0000
+++ b/doc/raw/s2/lj/quickstart.xml Thu Dec 17 14:53:57 2009 +0000
@@ -1,6 +1,6 @@
<chapter id='&s2.idroot;quickstart'>
<title>Quick Start Guide</title>
- <subtitle>Quick Start Guide to using S2 on LiveJournal</subtitle>
+ <subtitle>Quick Start Guide to using S2 on Dreamwidth</subtitle>
<section id='&s2.idroot;quickstart.intro'>
<title>Getting to know S2</title>
@@ -95,14 +95,14 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>User</term>
+ <term>Wizard</term>
<listitem>
<simpara>
- A user layer is the final layer where most people's options will
be set. Few people
- will create a user layer by hand, because a user layer is mostly
handled by the customization
- wizards. To draw a final comparison to the old style system, you
can think of a user
+ A wizard layer is the final layer where most people's options
will be set. Few people
+ will create a wizard layer by hand, because a wizard layer is
mostly handled by the customization
+ wizards. To draw a final comparison to the old style system, you
can think of a wizard
layer as the equivalent to the <guilabel>Overrides</guilabel>
box for S1, except there is
- a lot less headache involved in creating a user layer.
+ a lot less headache involved in creating a wizard layer.
</simpara>
</listitem>
</varlistentry>
@@ -144,19 +144,19 @@
You can click the <guibutton>Apply Theme</guibutton> button
underneath a layout preview you like, to choose one. If you do not
like any of the color themes, you can override any color by creating
- a new user layer, which we'll explain how to do next.
+ a new wizard layer, which we'll explain how to do next.
</para>
</step>
<step>
<para>
You customize your journal further using
the <ulink url="&siteroot;/customize/options.bml">Customize Journal
Style</ulink> page.
- You can begin creating a custom user layer by clicking the
<guibutton>Customize Selected Theme</guibutton>
+ You can begin creating a custom wizard layer by clicking the
<guibutton>Customize Selected Theme</guibutton>
button at the bottom of the page.
</para>
</step>
</procedure>
- <procedure><title>Creating a user layer</title>
+ <procedure><title>Creating a wizard layer</title>
<step>
<para>
On the Customize Journal Style page, the <guilabel>Style</guilabel>
options
diff -r f00ab7d12a40 -r 9068a8bb8958 htdocs/customize/advanced/layers.bml
--- a/htdocs/customize/advanced/layers.bml Thu Dec 17 14:43:41 2009 +0000
+++ b/htdocs/customize/advanced/layers.bml Thu Dec 17 14:53:57 2009 +0000
@@ -187,8 +187,11 @@
$body .= "<tr><td colspan='4'><small>" .
BML::ml('.yourlayers.childof', {'aopts' =>
"href='$LJ::SITEROOT/customize/advanced/layerbrowse?id=$bid'", 'layerid' =>
$bid, 'name' => $pname}) . "</small></td></tr>\n";
}
my $lay = $ulay->{$lid};
+
+ # this ensures that 'user' layers are called 'wizard' layers in
the user interface
+ my $laytype = ( $lay->{'type'} eq 'user' ) ? 'wizard' :
$lay->{'type'};
my $name = LJ::ehtml($lay->{'name'}) ||
"<i>$ML{'.yourlayers.noname'}</i>";
- $body .= "<tr><td><a
href='layerbrowse?id=$lid'>$lid</a></td><td>$lay->{'type'}</td><td>$name</td><td>";
+ $body .= "<tr><td><a
href='layerbrowse?id=$lid'>$lid</a></td><td>$laytype</td><td>$name</td><td>";
$body .= "<form method='post' style='display:inline'
action='layeredit?id=$lid'>";
$body .= LJ::html_submit('action:edit', $ML{'.btn.edit'}, {
disabled => $noactions });
$body .= "</form>";
@@ -246,7 +249,7 @@
"" => "",
"theme" =>
$ML{'.createlayer.layoutspecific.select.theme'},
"i18n" =>
$ML{'.createlayer.layoutspecific.select.language'},
- "user" =>
$ML{'.createlayer.layoutspecific.select.user'}
+ "user" =>
$ML{'.createlayer.layoutspecific.select.user2'}
) . "\n";
my @layouts = ('', '');
diff -r f00ab7d12a40 -r 9068a8bb8958 htdocs/customize/advanced/layers.bml.text
--- a/htdocs/customize/advanced/layers.bml.text Thu Dec 17 14:43:41 2009 +0000
+++ b/htdocs/customize/advanced/layers.bml.text Thu Dec 17 14:53:57 2009 +0000
@@ -25,7 +25,7 @@
.createlayer.layoutspecific.select.theme=Theme
-.createlayer.layoutspecific.select.user=User
+.createlayer.layoutspecific.select.user2=Wizard
.createlayer.layoutspecific.select.userlayer=[[name]] (#[[id]])
diff -r f00ab7d12a40 -r 9068a8bb8958 htdocs/customize/advanced/styles.bml
--- a/htdocs/customize/advanced/styles.bml Thu Dec 17 14:43:41 2009 +0000
+++ b/htdocs/customize/advanced/styles.bml Thu Dec 17 14:53:57 2009 +0000
@@ -461,7 +461,7 @@
$body .= "<tr><td>$ML{'.stylelayers.label.theme'} </td><td>";
$body .= $layerselect->('theme', $layout)->[0];
$body .= $layerother->('theme') . "</td></tr>\n";
- $body .= "<tr><td>$ML{'.stylelayers.label.user'} </td><td>";
+ $body .= "<tr><td>$ML{'.stylelayers.label.user2'} </td><td>";
$body .= $layerselect->('user', $layout)->[0];
$body .= $layerother->('user') . "</td></tr>\n";
$body .= "<tr><td> </td><td>";
diff -r f00ab7d12a40 -r 9068a8bb8958 htdocs/customize/advanced/styles.bml.text
--- a/htdocs/customize/advanced/styles.bml.text Thu Dec 17 14:43:41 2009 +0000
+++ b/htdocs/customize/advanced/styles.bml.text Thu Dec 17 14:53:57 2009 +0000
@@ -65,7 +65,7 @@
.stylelayers.label.theme=Theme:
-.stylelayers.label.user=User:
+.stylelayers.label.user2=Wizard:
.stylelayers.select.layout.other=Other ...
diff -r f00ab7d12a40 -r 9068a8bb8958 htdocs/customize/viewuser.bml
--- a/htdocs/customize/viewuser.bml Thu Dec 17 14:43:41 2009 +0000
+++ b/htdocs/customize/viewuser.bml Thu Dec 17 14:53:57 2009 +0000
@@ -19,7 +19,7 @@
LJ::load_user_props($u, "stylesys", "s2_style");
$body = "";
- $title = $ML{".user.layer"};
+ $title = $ML{".user.layer2"};
$body .= "<form method='get' action='viewuser'>\n";
$body .= LJ::make_authas_select($remote, { 'authas' => $GET{'authas'} }) .
"\n";
@@ -47,12 +47,12 @@
}
unless ($layer) {
- $body .= $ML{'.no.user.layer'};
+ $body .= $ML{'.no.user.layer2'};
return;
}
return $err->($ML{'.layer.belongs'}) unless $layer->{'userid'} ==
$u->{'userid'};
- return $err->($ML{'.layer.isnt.type'})
+ return $err->($ML{'.layer.isnt.type2'})
unless $layer->{'type'} eq "user";
my $lyr_layout = LJ::S2::load_layer($dbh, $layer->{'b2lid'});
diff -r f00ab7d12a40 -r 9068a8bb8958 htdocs/customize/viewuser.bml.text
--- a/htdocs/customize/viewuser.bml.text Thu Dec 17 14:43:41 2009 +0000
+++ b/htdocs/customize/viewuser.bml.text Thu Dec 17 14:53:57 2009 +0000
@@ -9,7 +9,7 @@
.layer.belongs=Layer belongs to another user.
-.layer.isnt.type=Layer isn't of type user or theme.
+.layer.isnt.type2=Layer isn't of type wizard or theme.
.layout.layer=Layout layer for this [[layertype]] layer not found.
@@ -17,7 +17,7 @@
.login.first=You must first <a [[url]]>login</a>.
-.no.user.layer=No user layer
+.no.user.layer2=No wizard layer
.raw=Raw
@@ -25,7 +25,7 @@
.switch=Switch
-.user.layer=User Layer
+.user.layer2=Wizard Layer
.work.with.journal=Work with journal:
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
