The proper fix will be done as part of bug 1616. X-Hg-Repo: dw-free Subject: dw-free: merge prior backout. From: mark changeset e441d515169f in /home/hg/repos/dw-free details: http://hg.dwscoalition.org/dw-free?cmd=changeset;node=e441d515169f description: merge prior backout.
diffs (583 lines): diff -r 0c18f326ab15 -r e441d515169f bin/upgrading/s2layers/basicboxes/themes.s2 --- a/bin/upgrading/s2layers/basicboxes/themes.s2 Sat Aug 22 18:20:19 2009 +0000 +++ b/bin/upgrading/s2layers/basicboxes/themes.s2 Mon Aug 24 20:28:05 2009 +0000 @@ -1,6 +1,171 @@ +#NEWLAYER: basicboxes/burgundy +layerinfo type = "theme"; +layerinfo name = "Burgundy"; +layerinfo redist_uniq = "basicboxes/burgundy"; +layerinfo author_name = "branchandroot"; + +# using the A Glass of Red Wine palette by Leopard (http://www.colourlovers.com/palette/912330/A_Glass_of_Red_Wine) + +##=============================== +## Page Colors +##=============================== + +set color_page_background = "#621F37"; +set color_page_link = "#eee3e3"; +set color_page_border = "#420B1F"; +set color_page_title = "#eee3e3"; + +set color_header_background = "#7B2C49"; + +##=============================== +## Entry Colors +##=============================== + +set color_entry_background = "#ffffff"; +set color_entry_text = "#000000"; +set color_entry_link = "#8B3C59"; +set color_entry_link_visited = "#5E1E36"; +set color_entry_border = "#420B1F"; +set color_entry_title = "#eee3e3"; +set color_entry_title_background = "#7B2C49"; + +##=============================== +## Module Colors +##=============================== + +set color_module_background = "#7B2C49"; +set color_module_text = "#420B1F"; +set color_module_border = "#420B1F"; +set color_module_title = "#420B1F"; +set color_module_title_background = "#eee3e3"; + + +#NEWLAYER: basicboxes/denim +layerinfo type = "theme"; +layerinfo name = "Denim"; +layerinfo redist_uniq = "basicboxes/denim"; +layerinfo author_name = "branchandroot"; + +# using the On the Down Low palette by llucious (http://www.colourlovers.com/palette/912662/On_the_Down_Low) + +##=============================== +## Page Colors +##=============================== + +set color_page_background = "#687385"; +set color_page_link = "#eAe9eC"; +set color_page_border = "#595D74"; +set color_page_title = "#eAe9eC"; + +set color_header_background = "#748896"; + +##=============================== +## Entry Colors +##=============================== + +set color_entry_background = "#ffffff"; +set color_entry_text = "#000000"; +set color_entry_link = "#748896"; +set color_entry_link_visited = "#939FA8"; +set color_entry_border = "#595D74"; +set color_entry_title = "#eAe9eC"; +set color_entry_title_background = "#748896"; + +##=============================== +## Module Colors +##=============================== + +set color_module_background = "#748896"; +set color_module_text = "#595D74"; +set color_module_border = "#595D74"; + + +#NEWLAYER: basicboxes/ecru +layerinfo type = "theme"; +layerinfo name = "Ecru"; +layerinfo redist_uniq = "basicboxes/ecru"; +layerinfo author_name = "branchandroot"; + +# using the My first palette palette by Josos (http://www.colourlovers.com/palette/913706/My_first_palette) + +##=============================== +## Page Colors +##=============================== + +set color_page_background = "#DEDBCA"; +set color_page_link = "#fff"; +set color_page_border = "#aFaD96"; +set color_page_title = "#fff"; + +set color_header_background = "#DEDBD1"; #DEDBD1 + +##=============================== +## Entry Colors +##=============================== + +set color_entry_background = "#ffffff"; +set color_entry_text = "#000000"; +set color_entry_link = "#aFaD96"; +set color_entry_link_visited = "#aaa"; +set color_entry_border = "#aFaD96"; +set color_entry_title = "#fff"; +set color_entry_title_background = "#DEDBD1"; + +##=============================== +## Module Colors +##=============================== + +set color_module_background = "#DEDBD1"; +set color_module_text = "#666"; +set color_module_border = "#aFaD96"; +set color_module_title = "#666"; +set color_module_title_background = "#fffefd"; + + +#NEWLAYER: basicboxes/eggplant +layerinfo type = "theme"; +layerinfo name = "Eggplant"; +layerinfo redist_uniq = "basicboxes/eggplant"; +layerinfo author_name = "kareila"; + +set layout_authors = [ { "name" => "kareila", "type" => "user" } ]; + +##=============================== +## Page Colors +##=============================== + +set color_page_background = "#40095d"; +set color_page_link = "#a8b257"; +set color_page_border = "#908aa6"; +set color_page_title = "#a8b257"; + +set color_header_background = "#641471"; + +##=============================== +## Entry Colors +##=============================== + +set color_entry_background = "#641471"; +set color_entry_text = "#bb90e0"; +set color_entry_link = "#a8b257"; +set color_entry_link_visited = "#908aa6"; +set color_entry_border = "#908aa6"; +set color_entry_title = "#641471"; +set color_entry_title_background = "#a8b257"; + +##=============================== +## Module Colors +##=============================== + +set color_module_background = "#641471"; +set color_module_text = "#bb90e0"; +set color_module_border = "#bb90e0"; +set color_module_title = "#a8b257"; + + #NEWLAYER: basicboxes/green layerinfo type = "theme"; -layerinfo name = "Basic Boxes Green"; +layerinfo name = "Green"; layerinfo redist_uniq = "basicboxes/green"; layerinfo author_name = "branchandroot"; @@ -34,5 +199,89 @@ set color_module_background = "#92a252"; set color_module_background = "#92a252"; set color_module_text = "#566030"; set color_module_border = "#566030"; -set color_module_title = "#566030"; set color_module_title = "#e9eed3"; + + +#NEWLAYER: basicboxes/leaf +layerinfo type = "theme"; +layerinfo name = "Leaf"; +layerinfo redist_uniq = "basicboxes/leaf"; +layerinfo author_name = "branchandroot"; + +# using the Medusa's Hair palette by orangeword (http://www.colourlovers.com/palette/912486/Medusa_Hair) + +##=============================== +## Page Colors +##=============================== + +set color_page_background = "#4C6B2F"; +set color_page_link = "#e9eee0"; +set color_page_border = "#24400B"; +set color_page_title = "#e9eee0"; + +set color_header_background = "#608042"; + +##=============================== +## Entry Colors +##=============================== + +set color_entry_background = "#ffffff"; +set color_entry_text = "#000000"; +set color_entry_link = "#608042"; +set color_entry_link_visited = "#304F14"; +set color_entry_border = "#24400B"; +set color_entry_title = "#e9eee0"; +set color_entry_title_background = "#608042"; + +##=============================== +## Module Colors +##=============================== + +set color_module_background = "#608042"; +set color_module_text = "#24400B"; +set color_module_border = "#24400B"; +set color_module_title = "#24400B"; +set color_module_title_background = "#e9eee0"; + + +#NEWLAYER: basicboxes/peach +layerinfo type = "theme"; +layerinfo name = "Peach"; +layerinfo redist_uniq = "basicboxes/peach"; +layerinfo author_name = "branchandroot"; + +# using the Pure palette by Sruoloc (http://www.colourlovers.com/palette/912313/Pure) + +##=============================== +## Page Colors +##=============================== + +set color_page_background = "#FFDDBA"; +set color_page_link = "#125468"; +set color_page_border = "#FFCD9C"; +set color_page_title = "#125468"; + +set color_header_background = "#FFEBD6"; + +##=============================== +## Entry Colors +##=============================== + +set color_entry_background = "#ffffff"; +set color_entry_text = "#000000"; +set color_entry_link = "#FFCD9C"; +set color_entry_link_visited = "#FFDDBA"; +set color_entry_border = "#FFCD9C"; +set color_entry_title = "#125468"; +set color_entry_title_background = "#FFEBD6"; + +##=============================== +## Module Colors +##=============================== + +set color_module_background = "#FFEBD6"; +set color_module_text = "#fFbD8C"; +set color_module_border = "#FFCD9C"; +set color_module_title = "#125468"; +set color_module_title_background = "#FFF6ED"; + diff -r 0c18f326ab15 -r e441d515169f bin/upgrading/s2layers/core1.s2 --- a/bin/upgrading/s2layers/core1.s2 Sat Aug 22 18:20:19 2009 +0000 +++ b/bin/upgrading/s2layers/core1.s2 Mon Aug 24 20:28:05 2009 +0000 @@ -1888,6 +1888,7 @@ function lang_viewname(string viewid) [n if ($viewid == "reply") { return "Post Comment"; } if ($viewid == "tags") { return "Tags"; } if ($viewid == "memories") { return $*text_view_memories; } + if ($viewid == "network") { return $*text_view_friendsfriends; } return "Unknown View"; } diff -r 0c18f326ab15 -r e441d515169f bin/upgrading/s2layers/core2.s2 --- a/bin/upgrading/s2layers/core2.s2 Sat Aug 22 18:20:19 2009 +0000 +++ b/bin/upgrading/s2layers/core2.s2 Mon Aug 24 20:28:05 2009 +0000 @@ -657,7 +657,7 @@ class FriendsPage extends RecentPage "A user-selected title for their friends page."; var string friends_mode - "The 'mode' of this view. An empty string indicates a normal friends view, while 'friendsfriends' indicates the Friends-of-friends view."; + "The 'mode' of this view. An empty string indicates a normal friends view, while 'network' indicates the network view."; var bool filter_active "If true, some kind of filter is in effect. If this filter has a name, it will be included in [member[FriendsPage.filter_name]]"; @@ -1852,7 +1852,7 @@ property string text_view_friends_comm { "size" = 15; example = "Members' Journals"; } -property string text_view_friendsfriends { +property string text_view_network { des = "Title of the 'Network' view"; maxlength = 40; "size" = 15; @@ -1864,7 +1864,7 @@ property string text_view_friends_filter "size" = 15; example = "Subscriptions (Custom filter)"; } -property string text_view_friendsfriends_filter { +property string text_view_network_filter { des = "Title of a Network page with an unnamed filter in effect"; maxlength = 40; "size" = 15; @@ -1891,7 +1891,7 @@ property string text_view_memories { } property string text_view_tags { - des = "Text used to link to the Tags page"; + des = "Text used to link to the 'Tags' page"; maxlength = 40; "size" = 15; example = "My Tags"; @@ -1901,8 +1901,8 @@ set text_view_friends = "Reading"; set text_view_friends = "Reading"; set text_view_friends_comm = "Reading"; set text_view_friends_filter = "Reading (Custom filter)"; -set text_view_friendsfriends = "Network"; -set text_view_friendsfriends_filter = "Network (Custom filter)"; +set text_view_network = "Network"; +set text_view_network_filter = "Network (Custom filter)"; set text_view_archive = "Archive"; set text_view_userinfo = "Profile"; set text_view_memories = "Memories"; @@ -2667,6 +2667,7 @@ function lang_viewname(string viewid) [n if ($viewid == "recent") { return $*text_view_recent; } if ($viewid == "archive") { return $*text_view_archive; } if ($viewid == "read") { return $*text_view_friends; } + if ($viewid == "network") { return $*text_view_network; } if ($viewid == "day") { return "Day"; } if ($viewid == "month") { return "Month"; } if ($viewid == "userinfo") { return $*text_view_userinfo; } @@ -2674,6 +2675,7 @@ function lang_viewname(string viewid) [n if ($viewid == "reply") { return "Post Comment"; } if ($viewid == "tags") { return "$*text_view_tags"; } if ($viewid == "memories") { return $*text_view_memories; } + if ($viewid == "network") { return $*text_view_network; } return "Unknown View"; } @@ -3044,14 +3046,14 @@ function FriendsPage::view_title() : str elseif ($.friends_mode == "network") { if ($.filter_active) { if ($.filter_name != "") { - return $*text_view_friendsfriends+" ("+$.filter_name+")"; - } - else { - return $*text_view_friendsfriends_filter; + return $*text_view_network+" ("+$.filter_name+")"; + } + else { + return $*text_view_network_filter; } } else { - return $*text_view_friendsfriends; + return $*text_view_network; } } else { diff -r 0c18f326ab15 -r e441d515169f bin/upgrading/s2layers/core2base/layout.s2 --- a/bin/upgrading/s2layers/core2base/layout.s2 Sat Aug 22 18:20:19 2009 +0000 +++ b/bin/upgrading/s2layers/core2base/layout.s2 Mon Aug 24 20:28:05 2009 +0000 @@ -213,6 +213,7 @@ propgroup text { property use text_view_recent; property use text_view_friends; + property use text_view_network; property use text_view_archive; property use text_view_userinfo; property use text_view_memories; diff -r 0c18f326ab15 -r e441d515169f bin/upgrading/s2layers/drifting/layout.s2 --- a/bin/upgrading/s2layers/drifting/layout.s2 Sat Aug 22 18:20:19 2009 +0000 +++ b/bin/upgrading/s2layers/drifting/layout.s2 Mon Aug 24 20:28:05 2009 +0000 @@ -88,6 +88,7 @@ propgroup text { property use text_view_recent; property use text_view_friends; + property use text_view_network; property use text_view_friends_comm; property use text_view_friends_filter; property use text_view_archive; diff -r 0c18f326ab15 -r e441d515169f bin/upgrading/s2layers/negatives/layout.s2 --- a/bin/upgrading/s2layers/negatives/layout.s2 Sat Aug 22 18:20:19 2009 +0000 +++ b/bin/upgrading/s2layers/negatives/layout.s2 Mon Aug 24 20:28:05 2009 +0000 @@ -196,6 +196,7 @@ propgroup text { property use text_view_recent; property use text_view_friends; + property use text_view_network; property use text_view_friends_comm; property use text_view_friends_filter; property use text_view_archive; diff -r 0c18f326ab15 -r e441d515169f cgi-bin/LJ/S2.pm --- a/cgi-bin/LJ/S2.pm Sat Aug 22 18:20:19 2009 +0000 +++ b/cgi-bin/LJ/S2.pm Mon Aug 24 20:28:05 2009 +0000 @@ -2020,6 +2020,7 @@ sub Page userinfo => $u->profile_url, archive => "$base_url/calendar", read => "$base_url/read", + network => "$base_url/network", tags => "$base_url/tag", memories => "$LJ::SITEROOT/tools/memories?user=$u->{user}", }, @@ -2076,7 +2077,8 @@ sub Page } # Identity (type I) accounts only have read views - $p->{'views_order'} = [ 'read', 'userinfo' ] if $u->is_identity; + $p->{views_order} = [ 'read', 'userinfo' ] if $u->is_identity; + $p->{views_order} = [ 'recent', 'archive', 'read', 'network', 'tags', 'memories', 'userinfo' ] if $u->is_paid; return $p; } diff -r 0c18f326ab15 -r e441d515169f cgi-bin/LJ/S2Theme.pm --- a/cgi-bin/LJ/S2Theme.pm Sat Aug 22 18:20:19 2009 +0000 +++ b/cgi-bin/LJ/S2Theme.pm Mon Aug 24 20:28:05 2009 +0000 @@ -720,6 +720,7 @@ sub navigation_props { text_view_friends text_view_friends_comm text_view_friends_filter + text_view_network text_view_memories text_view_recent text_view_userinfo diff -r 0c18f326ab15 -r e441d515169f cgi-bin/LJ/S2Theme/basicboxes.pm --- a/cgi-bin/LJ/S2Theme/basicboxes.pm Sat Aug 22 18:20:19 2009 +0000 +++ b/cgi-bin/LJ/S2Theme/basicboxes.pm Mon Aug 24 20:28:05 2009 +0000 @@ -7,8 +7,32 @@ sub designer { "branchandroot" } sub designer { "branchandroot" } +package LJ::S2Theme::basicboxes::burgundy; +use base qw( LJ::S2Theme::basicboxes ); +sub cats { qw() } + +package LJ::S2Theme::basicboxes::denim; +use base qw( LJ::S2Theme::basicboxes ); +sub cats { qw() } + +package LJ::S2Theme::basicboxes::ecru; +use base qw( LJ::S2Theme::basicboxes ); +sub cats { qw() } + +package LJ::S2Theme::basicboxes::eggplant; +use base qw( LJ::S2Theme::basicboxes ); +sub cats { qw() } + package LJ::S2Theme::basicboxes::green; use base qw( LJ::S2Theme::basicboxes ); sub cats { qw( featured ) } +package LJ::S2Theme::basicboxes::leaf; +use base qw( LJ::S2Theme::basicboxes ); +sub cats { qw() } + +package LJ::S2Theme::basicboxes::peach; +use base qw( LJ::S2Theme::basicboxes ); +sub cats { qw() } + 1; diff -r 0c18f326ab15 -r e441d515169f cgi-bin/LJ/Widget/SubmitRequest.pm --- a/cgi-bin/LJ/Widget/SubmitRequest.pm Sat Aug 22 18:20:19 2009 +0000 +++ b/cgi-bin/LJ/Widget/SubmitRequest.pm Mon Aug 24 20:28:05 2009 +0000 @@ -31,16 +31,16 @@ sub render_body { unless ($remote) { $ret .= "<?p <em>" . $class->ml('widget.support.submit.login.note', {sitename=>$LJ::SITENAMESHORT, loginlink=>"href='$LJ::SITEROOT/login?ret=1'"}) . "</em> p?>"; - $ret .= "<p><b>" . $class->ml('widget.support.submit.yourname') . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; + $ret .= "<h5>" . $class->ml('widget.support.submit.yourname') . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; $ret .= $class->html_text(name => 'reqname', size => '40', maxlength => '50', value => $post->{reqname}); - $ret .= "</div></p>"; + $ret .= "</p></div>"; } - $ret .= "<p><b>" . $class->ml('widget.support.submit.yourmail') . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; + $ret .= "<h5>" . $class->ml('widget.support.submit.yourmail') . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; $ret .= $class->html_text(name => 'email', size => '30', maxlength => '70', value => $post->{email}); - $ret .= "<br /><?de " . $class->ml('widget.support.submit.notshow') . " de?></div></p>"; + $ret .= "<br /><?de " . $class->ml('widget.support.submit.notshow') . " de?></p></div>"; }; my $cats = LJ::Support::load_cats(); @@ -50,16 +50,16 @@ sub render_body { # shown with no choices if passed in as an opt } elsif (($cat = LJ::Support::get_cat_by_key($cats, $opts{category})) && $cat->{is_selectable}) { - $ret .= "<p><b>" . $class->ml('widget.support.submit.category') . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; + $ret .= "<h5>" . $class->ml('widget.support.submit.category') . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; $ret .= $cat->{catname}; - $ret .= "</div></p>"; + $ret .= "</p></div>"; $ret .= $class->html_hidden("spcatid" => $cat->{spcatid}); # dropdown, otherwise } else { - $ret .= "<p><b>" . $class->ml('widget.support.submit.category') . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; + $ret .= "<h5>" . $class->ml('widget.support.submit.category') . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; my @choices; foreach (sort { $a->{sortorder} <=> $b->{sortorder} } values %$cats) { @@ -69,7 +69,7 @@ sub render_body { $ret .= $class->html_select(name => 'spcatid', list => \...@choices, selected => $post->{spcatid}); $ret .= LJ::run_hook("support_request_cat_extra_text"); - $ret .= "</div></p>"; + $ret .= "</p></div>"; } if (LJ::is_enabled("support_request_language")) { @@ -83,35 +83,35 @@ sub render_body { if ($lang_list) { push @$lang_list, ( xx => $class->ml('widget.support.submit.language.other') ); - $ret .= "<p><b>" . $class->ml('widget.support.submit.language') . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; - $ret .= "<p><?de " . $class->ml('widget.support.submit.language.note') . " de?></p>"; + $ret .= "<h5>" . $class->ml('widget.support.submit.language') . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; + $ret .= "<?de " . $class->ml('widget.support.submit.language.note') . " de?><br />"; $ret .= $class->html_select(name => 'language', list => $lang_list, selected => $post->{language} || "en_LJ"); - $ret .= "</div></p>"; + $ret .= "</p></div>"; } } - $ret .= "<p><b>" . $class->header_summary(%opts) . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; + $ret .= "<h5>" . $class->header_summary(%opts) . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; $ret .= $class->html_text(name => 'subject', size => '40', maxlength => '80', value => $post->{subject}); - $ret .= "</div></p>"; + $ret .= "</p></div>"; - $ret .= "<p><b>" . $class->header_question(%opts) . "</b><br />"; - $ret .= "<div style='margin-left: 30px'>"; - $ret .= "<p><?de " . $class->text_question(%opts) . " de?></p>"; + $ret .= "<h5>" . $class->header_question(%opts) . "</h5>"; + $ret .= "<div style='margin-left: 30px'><p>"; + $ret .= "<?de " . $class->text_question(%opts) . " de?><br />"; $ret .= $class->html_textarea(name => 'message', rows => '15', cols => '70', wrap => 'soft', value => $post->{message}); - $ret .= "</div></p>"; + $ret .= "</p></div>"; if ($LJ::HUMAN_CHECK{support_submit} && LJ::is_enabled("recaptcha") && !$remote) { my $c = Captcha::reCAPTCHA->new; - $ret .= "<p><b>" . $class->ml('widget.support.submit.captcha') . "</b><br />"; + $ret .= "<h5>" . $class->ml('widget.support.submit.captcha') . "</h5>"; $ret .= "<div style='margin-left: 30px'>"; $ret .= "<p><?de " . $class->text_captcha(%opts) . " de?></p>"; $ret .= "<div style='position: relative; height: 1%;'>" . $c->get_options_setter({ theme => 'white' }); $ret .= $c->get_html( LJ::conf_test($LJ::RECAPTCHA{public_key}) ) . "</div>"; $ret .= "<p>" . BML::ml( 'captcha.accessibility.contact', { email => $LJ::SUPPORT_EMAIL } ) . "</p>"; - $ret .= "</div></p>"; + $ret .= "</div>"; } $ret .= "<br /><?standout <input type='submit' value='" . $class->text_submit(%opts) . "' /> standout?>"; diff -r 0c18f326ab15 -r e441d515169f htdocs/manage/tags.bml --- a/htdocs/manage/tags.bml Sat Aug 22 18:20:19 2009 +0000 +++ b/htdocs/manage/tags.bml Mon Aug 24 20:28:05 2009 +0000 @@ -303,7 +303,7 @@ HEAD my $grouplist = $u->trust_groups; push @groups, map { "group:" . $_, $grouplist->{$_}->{groupname} } - sort { $grouplist->{$a}->{sortorder} <=> $grouplist->{$b}->{sortorder} } + sort { $grouplist->{$a}->{groupname} cmp $grouplist->{$b}->{groupname} } keys %$grouplist; my $security = LJ::Tags::get_permission_levels($u); _______________________________________________ dw-changelog mailing list [email protected] http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
