[dw-free] Add more text options in the wizard

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/dd69cca39bad]

http://bugs.dwscoalition.org/show_bug.cgi?id=1153

Add text_view_tags; expose more text options to Negatives

Patch by liv.

Files modified:

• bin/upgrading/s2layers/core2.s2
• bin/upgrading/s2layers/negatives/layout.s2
• cgi-bin/LJ/S2Theme.pm

--------------------------------------------------------------------------------
diff -r c1529ebb1660 -r dd69cca39bad bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Mon May 11 17:20:25 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Mon May 11 17:47:57 2009 +0000
@@ -1720,6 +1720,13 @@ property string text_view_memories {
     example = "My Memories";
 }
 
+property string text_view_tags {
+    des = "Text used to link to the Tags page";
+    maxlength = 20;
+    "size" = 15;
+    example = "My Tags";
+}
+
 set text_view_recent = "Recent Entries";
 set text_view_friends = "Reading";
 set text_view_friends_comm = "Reading";
@@ -1729,6 +1736,7 @@ set text_view_archive = "Archive";
 set text_view_archive = "Archive";
 set text_view_userinfo = "Profile";
 set text_view_memories = "Memories";
+set text_view_tags = "Tags";
 
 property string text_skiplinks_back {
     des = "Text to show in a link to skip back through entries";
@@ -2429,7 +2437,7 @@ function lang_viewname(string viewid) [n
     if ($viewid == "userinfo") { return $*text_view_userinfo; }
     if ($viewid == "entry") { return "Read Comments"; }
     if ($viewid == "reply") { return "Post Comment"; }
-    if ($viewid == "tags") { return "Tags"; }
+    if ($viewid == "tags") { return "$*text_view_tags"; }
     if ($viewid == "memories") { return $*text_view_memories; }
     return "Unknown View";
 }
diff -r c1529ebb1660 -r dd69cca39bad bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Mon May 11 17:20:25 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Mon May 11 17:47:57 2009 +0000
@@ -4,7 +4,6 @@ layerinfo author_name = "phoenix";
 layerinfo author_name = "phoenix";
 layerinfo des = "Highly customisable div-based layout";
 layerinfo lang = "en";
-
 
 ##===============================
 ## Display settings - general
@@ -129,15 +128,21 @@ propgroup customcss {
     property use custom_css;
 }
 
+propgroup text {
+
 ##===============================
 ## Text - main navigation
 ##===============================
+
+    property use text_view_archive;
+    property use text_view_userinfo;
+    property use text_view_memories;
+    property use text_view_tags;
 
 ##===============================
 ## Text - entry comment-related
 ##===============================
 
-propgroup text {
     property use text_view_recent;
     property use text_view_friends;
     property use text_view_friends_comm;
@@ -151,6 +156,23 @@ propgroup text {
     property use text_read_comments;
     property use text_post_comment_friends;
     property use text_read_comments_friends;
+
+    property use text_skiplinks_back;
+    property use text_skiplinks_forward;
+    property use text_meta_music; 
+    property use text_meta_mood; 
+    property use text_meta_location; 
+    property use text_tags; 
+
+    property use text_entry_prev;
+    property use text_entry_next; 
+    property use text_edit_entry; 
+    property use text_edit_tags; 
+    property use text_tell_friend; 
+    property use text_mem_add; 
+    property use text_watch_comments; 
+    property use text_unwatch_comments; 
+    property use text_permalink;
 }
 
 set font_base ="Georgia";
diff -r c1529ebb1660 -r dd69cca39bad cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Mon May 11 17:20:25 2009 +0000
+++ b/cgi-bin/LJ/S2Theme.pm	Mon May 11 17:47:57 2009 +0000
@@ -703,6 +703,7 @@ sub navigation_props {
         text_view_memories
         text_view_recent
         text_view_userinfo
+        text_view_tags
     ) 
 }
 
@@ -721,6 +722,9 @@ sub entry_props {
         text_mem_add
         text_post_comment
         text_read_comments
+        text_post_comment_friends
+        text_read_comments_friends
+        text_permalink
         text_entry_prev
         text_entry_next
         text_tell_friend
--------------------------------------------------------------------------------