Типа я (zilogic) wrote in changelog,
Типа я
zilogic
changelog

[ljcom] r12976: LJSUP-14374: New links in the footer

Committer: amyshkin
LJSUP-14374: New links in the footer
U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm
U   trunk/templates/SiteScheme/lanzelot.tmpl
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-12-03 10:26:22 UTC (rev 12975)
+++ trunk/bin/upgrading/en_LJ.dat	2012-12-03 12:38:54 UTC (rev 12976)
@@ -3972,6 +3972,7 @@
 horizon.footer.about.contact=Contact
 
 horizon.footer.about.header=About
+horizon.footer.about.header.lj=LJ
 
 horizon.footer.about.jobs|staleness=1
 horizon.footer.about.jobs=Jobs
@@ -3982,6 +3983,9 @@
 horizon.footer.about.news|staleness=1
 horizon.footer.about.news=Site News
 
+horizon.footer.about.news|staleness=1
+horizon.footer.abuse=Abuse team
+
 horizon.footer.advertise=Advertise
 
 horizon.footer.copyright|staleness=1
@@ -4499,8 +4503,14 @@
 
 horizon.sitemap.account_settings=Account Settings
 
+horizon.sitemap.adv=Advertisement
+
 horizon.sitemap.contact=Contact Us
 
+horizon.sitemap.contacts=Contacts
+
+horizon.sitemap.devices=Mobile version
+
 horizon.sitemap.downloads=Downloads
 
 horizon.sitemap.faqs=FAQs
@@ -4525,6 +4535,8 @@
 horizon.sitemap.reportabuse|staleness=1
 horizon.sitemap.reportabuse=Report Abuse
 
+horizon.sitemap.site=View full site map
+
 horizon.sitemap.support=Support
 
 horizon.sitemap.supportfaqs=<a [[aopts1]]>Support</a> &amp; <a [[aopts2]]>FAQs</a>

Modified: trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm
===================================================================
--- trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm	2012-12-03 10:26:22 UTC (rev 12975)
+++ trunk/cgi-bin/LJ/SiteScheme/Lanzelot.pm	2012-12-03 12:38:54 UTC (rev 12976)
@@ -133,6 +133,15 @@
 
     my $journal = LJ::get_active_journal();
 
+    my $lang_select_html = LJ::html_select(
+        {
+            'name'     => 'lang',
+            'id'       => 'footer_lang_list',
+            'selected' => LJ::Lang::current_language,
+        },
+        @{ LJ::Lang::get_lang_names() },
+    );
+
     return {
         %{ $class->common_template_params($args) },
 
@@ -150,6 +159,8 @@
         'ml_footer_supportfaqs'      => $ml_footer_supportfaqs,
         'ml_footer_feedbackcontacts' => $ml_footer_feedbackcontacts,
         'logo_style'                 => $journal && $journal->username() eq 'lj_singapore' ? 'sg' : 'lj',
+        'lang_select_html'           => $lang_select_html,
+
     };
 }
 

Modified: trunk/templates/SiteScheme/lanzelot.tmpl
===================================================================
--- trunk/templates/SiteScheme/lanzelot.tmpl	2012-12-03 10:26:22 UTC (rev 12975)
+++ trunk/templates/SiteScheme/lanzelot.tmpl	2012-12-03 12:38:54 UTC (rev 12976)
@@ -375,17 +375,14 @@
                 <tr>
                     <td class="manage">
                         <ul>
-                            <li><a href="<TMPL_VAR lj_siteroot>/manage/horizon.bml"><TMPL_VAR expr="ml('horizon.sitemap.manage_account')"></a></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/manage/payments/"><TMPL_VAR expr="ml('horizon.sitemap.upgrade')"></a></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/shop/"><TMPL_VAR expr="ml('horizon.sitemap.giftshop')"></a></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/download/"><TMPL_VAR expr="ml('horizon.sitemap.downloads')"></a></li>
-                            <li><TMPL_VAR ml_footer_supportfaqs></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/support/faqbrowse.bml?faqid=57"><TMPL_VAR expr="ml('horizon.sitemap.volunteer')"></a></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/about/contacts/"><TMPL_VAR expr="ml('horizon.footer.about.contact')"></a></li>
                             <li><a href="<TMPL_VAR lj_siteroot>/about"><TMPL_VAR expr="ml('horizon.sitemap.about')"></a></li>
+                            <li><a href="<TMPL_VAR lj_siteroot>/about/contacts"><TMPL_VAR expr="ml('horizon.sitemap.contacts')"></a></li>
+                            <li><a href="<TMPL_VAR lj_siteroot>/adv"><TMPL_VAR expr="ml('horizon.sitemap.adv')"></a></li>
+                            <li><a href="http://ru-news.livejournal.com/"><TMPL_VAR expr="ml('horizon.sitemap.news')"></a></li>
+                            <li><TMPL_VAR ml_footer_supportfaqs></li>
+                            <li><a href="<TMPL_VAR lj_siteroot>/devices/"><TMPL_VAR expr="ml('horizon.sitemap.devices')"></a></li>
+                            <li><a href="<TMPL_VAR lj_siteroot>/site/"><TMPL_VAR expr="ml('horizon.sitemap.site')"></a></li>
                         </ul>
-
-                        <span><a href="<TMPL_VAR lj_siteroot>/site/"><TMPL_VAR expr="ml('horizon.sitemap.more')"></a></span>
                     </td>
 
                     <td class="other">
@@ -393,13 +390,12 @@
                             <li><a href="<TMPL_VAR lj_siteroot>/tour/"><TMPL_VAR expr="ml('horizon.footer.tour')"></a></li>
                             <li><a href="<TMPL_VAR uri_tos>"><TMPL_VAR expr="ml('horizon.footer.tos')"></a></li>
                             <li><a href="<TMPL_VAR uri_privacy>"><TMPL_VAR expr="ml('horizon.footer.privacy')"></a></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/adv/"><TMPL_VAR expr="ml('horizon.footer.advertise')"></a></li>
-                            <li><a href="<TMPL_VAR lj_siteroot>/manage/settings/?cat=display"><TMPL_VAR expr="ml('horizon.footer.options')"></a></li>
-                            <li class="last"><a href="<TMPL_VAR lj_siteroot>/create.bml"><TMPL_VAR expr="ml('horizon.footer.create')"></a></li>
+                            <li><a href="<TMPL_VAR lj_siteroot>/abuse/"><TMPL_VAR expr="ml('horizon.footer.abuse')"></a></li>
                         </ul>
+                        <label><TMPL_VAR expr="ml('horizon.footer.language.header')"> <TMPL_VAR lang_select_html></label>
 
                         <TMPL_VAR version_html>
-                        
+
                         <dl class="social-links">
                              <dt><TMPL_VAR expr="ml('social.follow.us')"></dt>
                              <dd><a class="social-fb lj-track" href="http://www.facebook.com/livejournal.ru" target="_blank" title="<TMPL_VAR expr="ml('social.follow.us.fb')">"></a></dd>

Tags: amyshkin, dat, ljcom, pm, tmpl, zilogic
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments