Committer: esavintcev
LJSUP-12667: Switcher old/new update.bmlU trunk/bin/upgrading/en.dat U trunk/cgi-bin/LJ/Widget/EntryForm.pm U trunk/htdocs/stc/entry.css
Modified: trunk/bin/upgrading/en.dat =================================================================== --- trunk/bin/upgrading/en.dat 2012-06-25 14:00:38 UTC (rev 22321) +++ trunk/bin/upgrading/en.dat 2012-06-25 14:02:54 UTC (rev 22322) @@ -6143,6 +6143,12 @@ talk.post.backdated=do not add to friends page and RSS +talk.post.beta.about=<a href="#" target="_blank">About</a> + +talk.post.beta.turn.off=Switch to old version + +talk.post.beta.turn.on=Switch to new version + talk.post.change=change talk.post.change.back=change back Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm =================================================================== --- trunk/cgi-bin/LJ/Widget/EntryForm.pm 2012-06-25 14:00:38 UTC (rev 22321) +++ trunk/cgi-bin/LJ/Widget/EntryForm.pm 2012-06-25 14:02:54 UTC (rev 22322) @@ -449,7 +449,14 @@ }); $out .= "<script>try { \$('journal_timezone').value = - (new Date).getTimezoneOffset()/0.6; } catch(e) {} </script>"; - $out .= "<div id='metainfo-wrap'><ul id='metainfo'>"; + $out .= "<div id='metainfo-wrap'>"; + $out .= "<p class=\"b-updatepage-switchver\">"; + $out .= "<button type=\"submit\" name=\"ljpost:on\" value=\"ljpost:off\" class=\"b-updatepage-switchver-button\">"; + $out .= "<span class=\"b-updatepage-switchver-inner\">". LJ::Lang::ml('talk.post.beta.turn.on') ."</span>"; + $out .= "</button>"; + $out .= " (". LJ::Lang::ml('talk.post.beta.about') .")"; + $out .= "</p>"; + $out .= "<ul id='metainfo'>"; my $can_edit_date = 1; Modified: trunk/htdocs/stc/entry.css =================================================================== --- trunk/htdocs/stc/entry.css 2012-06-25 14:00:38 UTC (rev 22321) +++ trunk/htdocs/stc/entry.css 2012-06-25 14:02:54 UTC (rev 22322) @@ -1,8 +1,8 @@ /* for update.bml */ .small { - font-size: 85%; - margin-left: 6px; + font-size: 85%; + margin-left: 6px; } #draft-container TEXTAREA { padding: 6px 8px; @@ -19,58 +19,58 @@ color: #222; } .s-horizon #draft-container TEXTAREA { - font-family: monospace; - } + font-family: monospace; + } .s-lanzelot #draft-container TEXTAREA { - font-family: Arial, 'sans-serif'; - } + font-family: Arial, 'sans-serif'; + } #updateForm { - font-family: arial, verdana, 'sans-serif'; - min-width: 750px; - max-width: 800px; + font-family: arial, verdana, 'sans-serif'; + min-width: 750px; + max-width: 800px; } * html #updateForm { /* width: 725px; - width: 650px; */ /* once ad switched back to skyscraper, remove this */ + width: 650px; */ /* once ad switched back to skyscraper, remove this */ } #updateForm iframe { - margin: 0px; - padding: 0px; + margin: 0px; + padding: 0px; } #updateForm p { - clear: left; - margin: 0 0 4px 0; - position: relative; - line-height: 1.8em; + clear: left; + margin: 0 0 4px 0; + position: relative; + line-height: 1.8em; } #updateForm label { - font-weight: bold; + font-weight: bold; } #updateForm label.left { - width: auto; + width: auto; padding-right: 10px; - line-height: 1.6em; - font-size: 14px; + line-height: 1.6em; + font-size: 14px; } #updateForm label.options { - font-size: 11px; + font-size: 11px; } #updateForm input.text { - float: left; - font-size: 13px; + float: left; + font-size: 13px; } #updateForm select { - float: left; - font-size: 13px; + float: left; + font-size: 13px; } #updateForm .float-left { - float: left; + float: left; } #updateForm span.inputgroup-left { - display: block; float: left; width: 50%; position: relative; + display: block; float: left; width: 50%; position: relative; } #updateForm span.inputgroup-right { - display: block; float: right; width: 49%; position: relative; + display: block; float: right; width: 49%; position: relative; } #entryform-spellcheck-wrapper INPUT { overflow: visible; @@ -78,80 +78,80 @@ padding-right: 5px; } #updateForm span.inputgroup-right label.title { - width: 11em; + width: 11em; } #updateForm a.helplink { - margin-left: 5px; - margin-top: 4px; + margin-left: 5px; + margin-top: 4px; } #updateForm h4 { - margin: 0 0 4px 0; - padding: 0; + margin: 0 0 4px 0; + padding: 0; } #updateForm ul { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } #updateForm ul li { - margin: 0 0 4px 0; - padding: 0; + margin: 0 0 4px 0; + padding: 0; } #userpic { - float: left; - margin-right: 10px; - width: 100px; + float: left; + margin-right: 10px; + width: 100px; } #lj_userpicselect { - font-size: 85%; - color: #00C; - margin: 4px 0px 0px 5px; - position: relative; - font-size: 85%; + font-size: 85%; + color: #00C; + margin: 4px 0px 0px 5px; + position: relative; + font-size: 85%; } #lj_userpicselect_img { - display: block; - border: 1px solid #fff; - height: 100px; - position: relative; + display: block; + border: 1px solid #fff; + height: 100px; + position: relative; } #lj_userpicselect_img:hover { - border: 1px solid #003366; + border: 1px solid #003366; } #lj_userpicselect_img img { - display: block; - margin: 0 auto; - border: none; + display: block; + margin: 0 auto; + border: none; } #lj_userpicselect_img:hover img { - filter:alpha(opacity=35); - -moz-opacity:.35; - opacity:.35; + filter:alpha(opacity=35); + -moz-opacity:.35; + opacity:.35; } #lj_userpicselect_img_txt { - display: none; - position: absolute; - text-align: center; - left: 0; - top: 38px; - color: #003366 !important; - cursor: pointer; - width: 100%; + display: none; + position: absolute; + text-align: center; + left: 0; + top: 38px; + color: #003366 !important; + cursor: pointer; + width: 100%; } #userpic_preview { - width: 102px; + width: 102px; } #userpic_preview_image.userpic_loggedout { - border: 1px solid #003366; + border: 1px solid #003366; } .userpic_preview_border { - border: 1px solid #ccc; - text-align: center; - height: 70px; - padding-top: 30px; + border: 1px solid #ccc; + text-align: center; + height: 70px; + padding-top: 30px; } .userpic_preview_border a { - font-size: 90%; - line-height: 110%; + font-size: 90%; + line-height: 110%; } /* Metainfo @@ -361,222 +361,222 @@ margin-top: 3px; } #currentdate-edit { - font-size: 85%; - margin-left: 5px; + font-size: 85%; + margin-left: 5px; } #time-correct { - padding-left: 7.5em; + padding-left: 7.5em; } #infobox { - border-left: 1px solid #000; - padding-left: 10px; - float: right; - margin-bottom: 10px; - min-width: 130px; + border-left: 1px solid #000; + padding-left: 10px; + float: right; + margin-bottom: 10px; + min-width: 130px; } * html #infobox { - width: 130px; + width: 130px; } #infobox ul { - list-style: none; + list-style: none; } #entry { - clear: both; - padding: 0px; - margin: 0px; - position: relative; - background: url(/img/entry-tab-bg.gif?v=1) repeat-x 0 bottom; + clear: both; + padding: 0px; + margin: 0px; + position: relative; + background: url(/img/entry-tab-bg.gif?v=1) repeat-x 0 bottom; } #entry p { - margin: 0 !important; + margin: 0 !important; } #entry ul { - float: right; - clear: right; - list-style: none; - margin: 0; - padding: 0; + float: right; + clear: right; + list-style: none; + margin: 0; + padding: 0; } #entry ul li { - float: left; - margin: 0 4px 0 0; + float: left; + margin: 0 4px 0 0; } #entry ul li a { - display: block; - padding: 8px 10px; - background-color: #fff; - float: left; - outline: none; - border: 1px solid #6699CC; - border-bottom: none; + display: block; + padding: 8px 10px; + background-color: #fff; + float: left; + outline: none; + border: 1px solid #6699CC; + border-bottom: none; text-decoration:none; } #subject { - width: 52%; - /* width: 98%; */ - font-size: 16px; - margin-bottom: 4px; + width: 52%; + /* width: 98%; */ + font-size: 16px; + margin-bottom: 4px; } #draft-container { - border-left: 1px solid #bbb; - border-right: 1px solid #bbb; - border-bottom: 1px solid #bbb; - border-top: none; - margin-bottom: 4px; - position: relative; - padding: 0px 4px 2px 4px; + border-left: 1px solid #bbb; + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; + border-top: none; + margin-bottom: 4px; + position: relative; + padding: 0px 4px 2px 4px; } * html #draft-container { - padding: 0; + padding: 0; } #draft { - display: inline-block; - width: 100%; - height: 280px; - border: 0; + display: inline-block; + width: 100%; + height: 280px; + border: 0; } #draftstatus { - font-style: italic; - font-size: 80%; - border: none; - padding: 0 2px 0 0; - text-align: right; - display: block; - margin-bottom: 4px; - width: 100%; - background-color: #fff; + font-style: italic; + font-size: 80%; + border: none; + padding: 0 2px 0 0; + text-align: right; + display: block; + margin-bottom: 4px; + width: 100%; + background-color: #fff; } .errorbar { - margin-bottom: 10px !important; + margin-bottom: 10px !important; } .errorbar ul { - margin: 0 0 0 15px !important; + margin: 0 0 0 15px !important; } #spellcheck-results { - border: 1px solid #6699CC; - border-top: none; - font-size: 95%; - background-color: #ffffdd; - padding: 4px 6px; + border: 1px solid #6699CC; + border-top: none; + font-size: 95%; + background-color: #ffffdd; + padding: 4px 6px; } #spellcheck-results p { - font-size: 95% !important; + font-size: 95% !important; } #htmltools { - padding: 2px 4px; - position: relative; - border-right: 1px solid #bbb; - border-left: 1px solid #bbb; - margin: 0; + padding: 2px 4px; + position: relative; + border-right: 1px solid #bbb; + border-left: 1px solid #bbb; + margin: 0; } * html #htmltools ul { - height: 20px; + height: 20px; } #htmltools ul { - list-style: none; - margin: 0; - padding: 3px 2px 3px 5px; - border-bottom: 1px solid #BBB; - min-height: 18px; + list-style: none; + margin: 0; + padding: 3px 2px 3px 5px; + border-bottom: 1px solid #BBB; + min-height: 18px; } #htmltools ul li { - float: left; + float: left; width: 16px; height: 16px; - margin: 0 10px 0 0; - padding: 0; + margin: 0 10px 0 0; + padding: 0; text-indent: -3333px; line-height: 0; - font-size: 0; + font-size: 0; } #htmltools ul li a { - display: block; - overflow: hidden; - float: left; - height: 16px; + display: block; + overflow: hidden; + float: left; + height: 16px; border: none; - line-height: 19px; - text-decoration: none; + line-height: 19px; + text-decoration: none; } #htmltools ul li.image a { - background: url(/js/ck/skins/v2/icons-new.png?v=1) no-repeat 0 -125px; - padding-left: 15px; + background: url(/js/ck/skins/v2/icons-new.png?v=1) no-repeat 0 -125px; + padding-left: 15px; } #htmltools ul li.image-beta { width: 18px; } #htmltools ul li.image-beta a { - background: url(/js/ck/skins/v2/icons-new.png?v=1) no-repeat 0 -309px; - padding-left: 18px; + background: url(/js/ck/skins/v2/icons-new.png?v=1) no-repeat 0 -309px; + padding-left: 18px; } #htmltools ul li.image a:hover { /* background: url(/img/html-buttons-image.gif?v=1) no-repeat 0 -40px; */ } #htmltools ul li.media a { - background: url(/js/ck/skins/v2/icons-new.png?v=1) no-repeat 0 -110px; - padding-left: 15px; + background: url(/js/ck/skins/v2/icons-new.png?v=1) no-repeat 0 -110px; + padding-left: 15px; } #htmltools ul li.media a:hover { /* background: url(/stc/fck/editor/plugins/livejournal/ljvideo.gif?v=1) no-repeat 0 -40px; */ } #htmltools ul li.movie a { - width: 21px; - background: url(/img/html-buttons-media.gif?v=1) no-repeat 0 0; + width: 21px; + background: url(/img/html-buttons-media.gif?v=1) no-repeat 0 0; } #htmltools ul li.movie a:hover { - background: url(/img/html-buttons-media.gif?v=1) no-repeat 0 -40px; + background: url(/img/html-buttons-media.gif?v=1) no-repeat 0 -40px; } #linebreaks { - position: absolute; - right: 6px; - top: 5px; + position: absolute; + right: 6px; + top: 5px; } #linebreaks label { - margin-right: 6px; + margin-right: 6px; } #linebreaks a.helplink { - display: inline !important; - float: none; - margin: 0 !important; + display: inline !important; + float: none; + margin: 0 !important; } #options, #public { - border: 1px solid #bbb; - background-color: #eee; - padding: 10px; + border: 1px solid #bbb; + background-color: #eee; + padding: 10px; } #public { - margin-top: 10px; - position: relative; - padding-left: 34px; - font-size: .85em; - color:#666; + margin-top: 10px; + position: relative; + padding-left: 34px; + font-size: .85em; + color:#666; } #public INPUT { - position: relative; - margin-left: -24px; - top: -2px; - margin-right: 3px; - float: left; zoom:1; + position: relative; + margin-left: -24px; + top: -2px; + margin-right: 3px; + float: left; zoom:1; } /*:first-child+html #public INPUT { - margin-right: 3px; + margin-right: 3px; }*/ * html #public INPUT { - margin-right: 1px; + margin-right: 1px; } #public LABEL { - font-weight: normal; - line-height: 1.4; - height: 1%; + font-weight: normal; + line-height: 1.4; + height: 1%; } * html #public LABEL { - float: left; + float: left; } #prop_taglist { - width: 70%; + width: 70%; } * HTML #prop_taglist { width: 68%; @@ -587,64 +587,64 @@ } #prop_current_moodid { - width: 30%; + width: 30%; } #prop_current_mood { - width: 14%; + width: 14%; } #prop_adult_content { - width: 48% + width: 48% } #modifydate label.right { - float: left; - display: block; - font-size: 90%; - line-height: 200%; + float: left; + display: block; + font-size: 90%; + line-height: 200%; } #modifydate a.helplink { - float: left; - display: block; + float: left; + display: block; } #mood_preview { - float: left; - position: absolute; - left: 80%; - top: -2px; - font-size: 90%; - text-align: center; - background: transparent; - min-width: 60px; - display: block !important; - line-height: 1; + float: left; + position: absolute; + left: 80%; + top: -2px; + font-size: 90%; + text-align: center; + background: transparent; + min-width: 60px; + display: block !important; + line-height: 1; } #mood_text_preview { - display: block; + display: block; } #prop_current_music, #prop_current_location { - width: 63%; + width: 63%; } #prop_current_music.narrow, #prop_current_location.narrow { - width: 39%; + width: 39%; } .hidden_submit { - position: absolute; - left: -9999px; - height: 0.1px; - font-size: 0.1em; - line-height: 0; + position: absolute; + left: -9999px; + height: 0.1px; + font-size: 0.1em; + line-height: 0; } #submitbar { - background-color: #ddd; - border: 1px solid #aaa; - padding: 7px 10px; - margin-top: 10px; - position: relative; + background-color: #ddd; + border: 1px solid #aaa; + padding: 7px 10px; + margin-top: 10px; + position: relative; } #security_container { overflow: hidden; @@ -660,135 +660,135 @@ } #security_container .security-options, #security_container .submit-options { - display: inline; + display: inline; } #security { - float: none !important; + float: none !important; } #custom_boxes { - display: none; - text-align:left; - float: left; + display: none; + text-align:left; + float: left; } * html #custom_boxes { - clear: left; + clear: left; } #custom_boxes.columns1 { - padding-left: 225px; - width: 150px !important; + padding-left: 225px; + width: 150px !important; } * html .columns1 { - padding-left: 225px; + padding-left: 225px; } #custom_boxes.columns2 { - padding-left: 150px; - width: 300px !important; + padding-left: 150px; + width: 300px !important; } * html .columns2 { - padding-left: 150px; + padding-left: 150px; } #custom_boxes.columns3 { - padding-left: 75px; - width: 450px !important; + padding-left: 75px; + width: 450px !important; } * html .columns3 { - padding-left: 75px; + padding-left: 75px; } #custom_boxes.columns4 { - padding-left: 0; - width: 600px !important; + padding-left: 0; + width: 600px !important; } #custom_boxes ul { - float: left !important; - width: 140px; - clear: none !important; - list-style: none; - margin: 0 10px 5px 0; - padding: 8px 0 0 0; + float: left !important; + width: 140px; + clear: none !important; + list-style: none; + margin: 0 10px 5px 0; + padding: 8px 0 0 0; } #custom_boxes ul li { - margin: 0 0 0 25px; - padding: 0; - line-height: 120%; - text-indent: -25px; + margin: 0 0 0 25px; + padding: 0; + line-height: 120%; + text-indent: -25px; } #security-help { margin-right: 5px; } /* for ad when it appears until box ad */ .medrect .ljadbadge { - width: 300px !important; - padding: 5px; - text-align: center; - margin-top: 15px; + width: 300px !important; + padding: 5px; + text-align: center; + margin-top: 15px; } .medrect .ljadbadge #ad2 { - background-color: #eee; - text-align: center; - width: 300px !important; - padding: 5px 0; + background-color: #eee; + text-align: center; + width: 300px !important; + padding: 5px 0; } .lastfm { - float: left; - width: 6.5em; - font-size: 11px; + float: left; + width: 6.5em; + font-size: 11px; } .lastfm SPAN { - font-weight: normal; - color:#999; - font-size: 9px; - line-height: 100%; - display: block; - padding-top: 4px; + font-weight: normal; + color:#999; + font-size: 9px; + line-height: 100%; + display: block; + padding-top: 4px; } .lastfm_lnk { - text-indent: -3000px; - width: 101px; - height: 29px; - float: left; - background: url(/stc/img/lastfm_logo.gif?v=1) no-repeat; - border-bottom: 0px !important; + text-indent: -3000px; + width: 101px; + height: 29px; + float: left; + background: url(/stc/img/lastfm_logo.gif?v=1) no-repeat; + border-bottom: 0px !important; } div.inbox_formmes { - clear: left; - margin-right: 160px; - max-width: 790px; - min-width: 550px; + clear: left; + margin-right: 160px; + max-width: 790px; + min-width: 550px; } .inbox_formmes .subj-l { - float: left; - width: 13%; + float: left; + width: 13%; } .inbox_formmes .subj-t { - width: 81%; + width: 81%; } .msg_txt { - width: 94% + width: 94% } .inbox_formmes div.msg_txt textarea { - width: 100%; - height: 300px; + width: 100%; + height: 300px; } td.subject-desc { - padding-right:0; - width:2%; + padding-right:0; + width:2%; } #updateForm td.subject-desc label.left { - width:auto; - min-width: 1em; - /*_width: 5em; - w\idth: 5em;*/ - padding-right: 1em; + width:auto; + min-width: 1em; + /*_width: 5em; + w\idth: 5em;*/ + padding-right: 1em; } td.tabs { - width:41%; + width:41%; } /* Geo Location */ @@ -798,13 +798,13 @@ .detect_btn { float: left; - } + } .detect_btn INPUT { float: left; padding-left: 5px; padding-right: 5px; overflow: visible; - } + } /* .detect_btn STRONG { display: block; line-height: 2.5em; @@ -848,40 +848,40 @@ /* Sponsored QotD*/ #updateForm .b-qotd { - margin: 10px 0; - background: url(/img/qotd/qotd-wepc.png?v=1) repeat-x; - border: 1px solid #054f90; - } - #updateForm .b-qotd H3 { - margin: 0.2em 0 0.4em; - } - #updateForm .b-qotd P { - margin: 0 0 0.75em; - } - #updateForm .b-qotd input.text { - float: none; - } - #updateForm .b-qotd-chekbox LABEL { - font-weight: normal; - } - #updateForm .b-qotd-chekbox INPUT { - position: relative; - top: 2px; - margin: 0 5px 0 0; - } - #updateForm .b-qotd-note { - font-size: 10px; - } + margin: 10px 0; + background: url(/img/qotd/qotd-wepc.png?v=1) repeat-x; + border: 1px solid #054f90; + } + #updateForm .b-qotd H3 { + margin: 0.2em 0 0.4em; + } + #updateForm .b-qotd P { + margin: 0 0 0.75em; + } + #updateForm .b-qotd input.text { + float: none; + } + #updateForm .b-qotd-chekbox LABEL { + font-weight: normal; + } + #updateForm .b-qotd-chekbox INPUT { + position: relative; + top: 2px; + margin: 0 5px 0 0; + } + #updateForm .b-qotd-note { + font-size: 10px; + } /* Preview of QotD */ #qotd_html_preview { - clear:both; - margin: 0 0 10px; - } - #qotd_html_preview A.more, - #qotd_html_preview A.more:hover { - background: none; - } + clear:both; + margin: 0 0 10px; + } + #qotd_html_preview A.more, + #qotd_html_preview A.more:hover { + background: none; + } .b-tnb-getstart { overflow: auto; @@ -904,3 +904,38 @@ padding-bottom: 9px; font-weight: bold; } + + + +/* switcher new version */ +.b-updatepage-switchver { + margin: 0; + padding: 0 20px 0 0; + text-align: right; + font: 14px/1.3 Arial,sans-serif; + } + .b-updatepage-switchver-button { + margin: 0; + padding: 0; + border: 0; + background: transparent; + font: 14px/1.3 Arial,sans-serif; + color: #000; + cursor: pointer; + } + .b-updatepage-switchver-inner { + margin: 0; + padding: 0; + } + .s-horizon .b-updatepage-switchver-inner { + color: #00C; + text-decoration: underline; + } + .s-lanzelot .b-updatepage-switchver-inner { + color: #3F5F9E; + border-bottom: 1px solid #CCC; + } + .s-lanzelot .b-updatepage-switchver-button:hover .b-updatepage-switchver-inner { + border-bottom: 1px solid #3F5F9E; + } +