Author: ghuber
Date: Wed Jun 25 07:33:04 2014
New Revision: 1605281
URL: http://svn.apache.org/r1605281
Log:
Theme switching only on main page.
Modified:
roller/trunk/app/src/main/webapp/themes/basic/permalink.vm
roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm
roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
Modified: roller/trunk/app/src/main/webapp/themes/basic/permalink.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/permalink.vm?rev=1605281&r1=1605280&r2=1605281&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/permalink.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/permalink.vm Wed Jun 25
07:33:04 2014
@@ -7,8 +7,8 @@
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
+<!-- permalink -->
<body>
-
<div id="id_permalink" class="content_wrapper">
<div class="content">
<h1 class="weblogName">$utils.escapeHTML($model.weblog.name)</h1>
Modified: roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm?rev=1605281&r1=1605280&r2=1605281&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm Wed Jun 25
07:33:04 2014
@@ -6,6 +6,7 @@
#showAutodiscoveryLinks($model.weblog)
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
</head>
+<!-- searchresults-mobile -->
<body>
<div class="content_wrapper">
Modified: roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm?rev=1605281&r1=1605280&r2=1605281&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm Wed Jun 25
07:33:04 2014
@@ -1,9 +1,5 @@
## sidebar contents
-
- <div class="mobile">
- <a id="btnMobile" href="#" alt="View Mobile Weblog">View Mobile Weblog</a>
- </div>
-
+ <!-- sidebar -->
<h2>Calendar</h2>
<div class="sidebar">
#showWeblogEntryCalendar($model.weblog "nil")
Modified: roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm?rev=1605281&r1=1605280&r2=1605281&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm Wed Jun 25
07:33:04 2014
@@ -38,7 +38,6 @@
}
</script>
</head>
-
<!-- weblog-mobile -->
<body>
<div id ="home" data-role="page">
Modified: roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/weblog.vm?rev=1605281&r1=1605280&r2=1605281&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog.vm Wed Jun 25 07:33:04
2014
@@ -9,7 +9,6 @@
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
#showMetaDescription()
<script type="text/javascript">
- console.log("init");
$(document).ready(function () {
$('#btnMobile').on('click', function() {
setCookie("roller_user_request_type","mobile",30);
@@ -24,6 +23,7 @@
}
</script>
</head>
+<!-- weblog -->
<body>
<div id="id_weblog" class="content_wrapper">
@@ -48,6 +48,9 @@
<div class="rightbar_wrapper">
<div class="rightbar">
+ <div class="mobile">
+ <a id="btnMobile" href="#" alt="View Mobile Weblog">View Mobile
Weblog</a>
+ </div>
#includeTemplate($model.weblog "sidebar")
</div>
</div>
