Author: snoopdave
Date: Sun Jul 6 15:23:55 2014
New Revision: 1608222
URL: http://svn.apache.org/r1608222
Log:
Remove moble features from Basic theme, add new Basic Mobile theme with mobile
features
Removed:
roller/trunk/app/src/main/webapp/themes/basic/_day-mobile.vm
roller/trunk/app/src/main/webapp/themes/basic/basic-mobile-custom.css
roller/trunk/app/src/main/webapp/themes/basic/images/
roller/trunk/app/src/main/webapp/themes/basic/permalink-mobile.vm
roller/trunk/app/src/main/webapp/themes/basic/searchresults-mobile.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog-mobile.vm
Modified:
roller/trunk/app/ (props changed)
roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css
roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm
roller/trunk/app/src/main/webapp/themes/basic/theme.xml
roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
Propchange: roller/trunk/app/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 6 15:23:55 2014
@@ -1,8 +1,9 @@
-nb-configuration.xml
+velocity.log
roller-startup.log
+nb-configuration.xml
.classpath
.externalToolBuilders
+*.iml
.project
target
.settings
-*.iml
Modified: roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css?rev=1608222&r1=1608221&r2=1608222&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css Sun Jul 6
15:23:55 2014
@@ -263,10 +263,3 @@ div.dayTitle {
width: 20%;
float: right;
}
-.mobile{
- width:250px;
- height: 51px;
- background: url($url.resource("images/forward_mobile.png")) top left
no-repeat;
- padding-top:17px;
- padding-left:60px;
-}
\ No newline at end of file
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=1608222&r1=1608221&r2=1608222&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/searchresults.vm Sun Jul 6
15:23:55 2014
@@ -6,7 +6,6 @@
#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/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/theme.xml?rev=1608222&r1=1608221&r2=1608222&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/theme.xml Sun Jul 6 15:23:55
2014
@@ -3,7 +3,7 @@
<id>basic</id>
<name>Basic</name>
- <description>Offers wide margins for blogging programming language source
code and a separate button for mobile viewing.</description>
+ <description>Offers wide margins for blogging programming language source
code.</description>
<author>Roller Weblogger</author>
<type>standard</type>
@@ -21,12 +21,6 @@
<contentsFile>basic-custom.css</contentsFile>
<type>standard</type>
</templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>basic-mobile-custom.css</contentsFile>
- <type>mobile</type>
- </templateCode>
</stylesheet>
<!-- templates -->
@@ -42,12 +36,6 @@
<contentsFile>weblog.vm</contentsFile>
<type>standard</type>
</templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>weblog-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
</template>
<template action="permalink">
@@ -62,12 +50,6 @@
<contentsFile>permalink.vm</contentsFile>
<type>standard</type>
</templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>permalink-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
</template>
<template action="search">
@@ -82,12 +64,6 @@
<contentsFile>searchresults.vm</contentsFile>
<type>standard</type>
</templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>searchresults-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
</template>
<template action="custom">
@@ -102,12 +78,6 @@
<contentsFile>_day.vm</contentsFile>
<type>standard</type>
</templateCode>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>_day-mobile.vm</contentsFile>
- <type>mobile</type>
- </templateCode>
</template>
<template action="custom">
@@ -123,7 +93,4 @@
<type>standard</type>
</templateCode>
</template>
-
- <!-- resources -->
- <resource path="images/forward_mobile.png" />
</weblogtheme>
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=1608222&r1=1608221&r2=1608222&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog.vm Sun Jul 6 15:23:55
2014
@@ -8,20 +8,6 @@
<script type="text/javascript"
src="http://code.jquery.com/jquery-1.11.0.min.js";></script>
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
#showMetaDescription()
- <script type="text/javascript">
- $(document).ready(function () {
- $('#btnMobile').on('click', function() {
- setCookie("roller_user_request_type","mobile",30);
- $("#btnMobile").attr('href', '?deviceType=mobile').click();
- });
- });
- function setCookie(c_name, value, exdays) {
- var exdate = new Date();
- exdate.setDate(exdate.getDate() + exdays);
- var c_value = escape(value) + ((exdays == null) ? "" : "; expires=" +
exdate.toUTCString() + "; path=/");
- document.cookie = c_name + "=" + c_value;
- }
- </script>
</head>
<!-- weblog -->
<body>
@@ -48,9 +34,6 @@
<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>
