changelog_bot (changelog_bot) wrote in changelog,
changelog_bot
changelog_bot
changelog

[livejournal] r17717: LJSUP-7380: behaviour of feed and sideba...

Committer: mchervonniy
LJSUP-7380: behaviour of feed and sidebar changed depends on vertical
U   trunk/htdocs/stc/widgets/search.css
U   trunk/templates/Browse/browse.tmpl
U   trunk/templates/Browse/featured_communities.tmpl
U   trunk/templates/Browse/sidebar.tmpl
U   trunk/templates/Browse/top_posts.tmpl
Modified: trunk/htdocs/stc/widgets/search.css
===================================================================
--- trunk/htdocs/stc/widgets/search.css	2010-11-18 08:08:07 UTC (rev 17716)
+++ trunk/htdocs/stc/widgets/search.css	2010-11-18 08:55:46 UTC (rev 17717)
@@ -32,10 +32,10 @@
 .appwidget-browse .appwidget-search INPUT.type-text {
 	width:230px;
 	}
-.appwidget-search P {
+.appwidget-browse .appwidget-search P {
 	position:relative;
 	}
-	.appwidget-search LABEL {
+	.appwidget-browse .vertical_view .appwidget-search LABEL {
 		position:absolute;
 		font-size:11px;
 		left:4px;

Modified: trunk/templates/Browse/browse.tmpl
===================================================================
--- trunk/templates/Browse/browse.tmpl	2010-11-18 08:08:07 UTC (rev 17716)
+++ trunk/templates/Browse/browse.tmpl	2010-11-18 08:55:46 UTC (rev 17717)
@@ -1,19 +1,23 @@
 <div class="l-body">
-	<div class="b-catalogue">
+	<div class="b-catalogue<tmpl_if is_vertical_view> vertical_view</tmpl_if>">
 		<div class="l-aside">	
 			<TMPL_INCLUDE menu.tmpl>
 		</div>
 		<div class="l-content">
 		<ul class="m-tab-switcher">
-			<li<tmpl_if expr="view eq 'recent_posts'"> class="cur"</tmpl_if>><a href="?view=recent_posts">Recent posts</a><i class="b-round-ctl"></i><i class="b-round-ctr"></i></li>
+			<tmpl_if is_vertical_view><li<tmpl_if expr="view eq 'recent_posts'"> class="cur"</tmpl_if>><a href="?view=recent_posts">Recent posts</a><i class="b-round-ctl"></i><i class="b-round-ctr"></i></li></tmpl_if>
 			<li<tmpl_if expr="view eq 'communities'"> class="cur"</tmpl_if>><a href="?view=communities">Communities</a><i class="b-round-ctl"></i><i class="b-round-ctr"></i></li>
 		</ul>
-		<tmpl_if expr="view eq 'communities'">
+		<tmpl_if is_vertical_view>
+			<tmpl_if expr="view eq 'communities'">
+				<TMPL_INCLUDE communities.tmpl>
+			</tmpl_if>
+			<tmpl_if expr="view eq 'recent_posts'">
+				<TMPL_INCLUDE recent_posts.tmpl>
+			</tmpl_if>
+		<tmpl_else>
 			<TMPL_INCLUDE communities.tmpl>
 		</tmpl_if>
-		<tmpl_if expr="view eq 'recent_posts'">
-			<TMPL_INCLUDE recent_posts.tmpl>
-		</tmpl_if>
 		</div>
 		<div class="l-sidebar">
 			<TMPL_INCLUDE sidebar.tmpl>

Modified: trunk/templates/Browse/featured_communities.tmpl
===================================================================
--- trunk/templates/Browse/featured_communities.tmpl	2010-11-18 08:08:07 UTC (rev 17716)
+++ trunk/templates/Browse/featured_communities.tmpl	2010-11-18 08:55:46 UTC (rev 17717)
@@ -1,4 +1,3 @@
-<tmpl_if is_vertical_view>
 <div class="appwidget appwidget-featuredcomms">
 <div class="right-mod">
 <div class="mod-tl">
@@ -36,4 +35,3 @@
 </div>
 </div>
 </div>
-</tmpl_if>

Modified: trunk/templates/Browse/sidebar.tmpl
===================================================================
--- trunk/templates/Browse/sidebar.tmpl	2010-11-18 08:08:07 UTC (rev 17716)
+++ trunk/templates/Browse/sidebar.tmpl	2010-11-18 08:55:46 UTC (rev 17717)
@@ -5,8 +5,8 @@
 <TMPL_IF ad><div class="b-catalogue-ads"><TMPL_VAR ad></div></TMPL_IF>
 <TMPL_VAR search_widget>
 <TMPL_IF 0><TMPL_VAR popular_interests_widget></TMPL_IF>
-<tmpl_include top_posts.tmpl>
-<tmpl_include featured_communities.tmpl>
+<tmpl_if is_vertical_view><tmpl_include top_posts.tmpl></tmpl_if>
+<tmpl_if is_vertical_view><tmpl_include featured_communities.tmpl></tmpl_if>
 <TMPL_VAR add_community_widget>
-<tmpl_var poll_of_the_day>
+<tmpl_if is_vertical_view><tmpl_var poll_of_the_day></tmpl_if>
 

Modified: trunk/templates/Browse/top_posts.tmpl
===================================================================
--- trunk/templates/Browse/top_posts.tmpl	2010-11-18 08:08:07 UTC (rev 17716)
+++ trunk/templates/Browse/top_posts.tmpl	2010-11-18 08:55:46 UTC (rev 17717)
@@ -1,4 +1,3 @@
-<tmpl_if is_vertical_view>
 <div class="appwidget appwidget-featuredposts">
 <div class="right-mod">
 <div class="mod-tl">
@@ -30,4 +29,3 @@
 </div>
 </div>
 </div>
-</tmpl_if>

Tags: changelog_bot, css, livejournal, tmpl
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