Author: snoopdave
Date: Sun Feb 12 14:08:46 2012
New Revision: 1243255
URL: http://svn.apache.org/viewvc?rev=1243255&view=rev
Log:
Commiting fix from Tiger Gui to improve the standard to mobile page switch
button and logic:
https://issues.apache.org/jira/browse/ROL-1937
Added:
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/images/
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/images/forward_mobile.png
(with props)
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/basic-custom.css
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/sidebar.vm
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java?rev=1243255&r1=1243254&r2=1243255&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
Sun Feb 12 14:08:46 2012
@@ -49,6 +49,7 @@ public class MobileDeviceRepository {
+ "vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\\\-|
)|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\\\-|2|g)|"
+ "yas\\\\-|your|zeto|zte\\\\-";
public static final String USER_REQUEST_TYPE =
"roller_user_request_type";
+ public static final String USER_AGENT_PARAMETER = "deviceType";
/**
*
@@ -65,12 +66,17 @@ public class MobileDeviceRepository {
public static DeviceType getRequestType(HttpServletRequest request) {
DeviceType type = DeviceType.standard;
+
+ String deviceTypeParam =
request.getParameter(USER_AGENT_PARAMETER);
+ if (deviceTypeParam !=null){
+ return deviceTypeParam.trim().equals("standard") ?
DeviceType.standard : DeviceType.mobile;
+ }
+
String cookie = getCookieValue(request.getCookies(),
USER_REQUEST_TYPE, null);
-
if (cookie != null) {
return cookie.equals("standard") ? DeviceType.standard
: DeviceType.mobile;
}
-
+
if (isMobileDevice(request)) {
type = DeviceType.mobile;
}
Modified:
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/basic-custom.css
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/basic-custom.css?rev=1243255&r1=1243254&r2=1243255&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/basic-custom.css
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/basic-custom.css
Sun Feb 12 14:08:46 2012
@@ -263,3 +263,10 @@ 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
Added:
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/images/forward_mobile.png
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/images/forward_mobile.png?rev=1243255&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/images/forward_mobile.png
------------------------------------------------------------------------------
svn:executable = *
Propchange:
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/images/forward_mobile.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/sidebar.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/sidebar.vm?rev=1243255&r1=1243254&r2=1243255&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/sidebar.vm
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/sidebar.vm Sun
Feb 12 14:08:46 2012
@@ -1,5 +1,9 @@
## sidebar contents
+ <div class="mobile">
+ <a href="/roller?deviceType=mobile" alt="View Mobile Weblog">View Mobile
Weblog</a>
+ </div>
+
<h2>Calendar</h2>
<div class="sidebar">
#showWeblogEntryCalendar($model.weblog "nil")
Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml?rev=1243255&r1=1243254&r2=1243255&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml Sun
Feb 12 14:08:46 2012
@@ -1,120 +1,122 @@
<?xml version="1.0" encoding="UTF-8"?>
<weblogtheme>
- <id>basic</id>
- <name>Basic</name>
- <author>Roller Weblogger</author>
- <type>standard</type>
+ <id>basic</id>
+ <name>Basic</name>
+ <author>Roller Weblogger</author>
+ <type>standard</type>
<!-- theme preview image -->
- <preview-image path="basic-preview.png" />
+ <preview-image path="basic-preview.png" />
<!-- stylesheet -->
- <stylesheet>
- <name>basic-custom.css</name>
- <description>Stylesheet for Basic theme</description>
- <link>basic-custom.css</link>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>basic-custom.css</contentsFile>
- <type>standard</type>
- </templateCode>
- </stylesheet>
+ <stylesheet>
+ <name>basic-custom.css</name>
+ <description>Stylesheet for Basic theme</description>
+ <link>basic-custom.css</link>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>basic-custom.css</contentsFile>
+ <type>standard</type>
+ </templateCode>
+ </stylesheet>
<!-- templates -->
- <template action="weblog">
- <name>Weblog</name>
- <description>weblog</description>
- <link></link>
- <navbar>false</navbar>
- <hidden>true</hidden>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <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">
- <name>permalink</name>
- <description>permalink</description>
- <link></link>
- <navbar>false</navbar>
- <hidden>true</hidden>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <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">
- <name>searchresults</name>
- <description>searchresults</description>
- <link></link>
- <navbar>false</navbar>
- <hidden>true</hidden>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <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">
- <name>_day</name>
- <description>_day</description>
- <link></link>
- <navbar>false</navbar>
- <hidden>true</hidden>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <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">
- <name>sidebar</name>
- <description>sidebar</description>
- <link></link>
- <navbar>false</navbar>
- <hidden>true</hidden>
- <templateCode>
- <templateLanguage>velocity</templateLanguage>
- <contentType>text/html</contentType>
- <contentsFile>sidebar.vm</contentsFile>
- <type>standard</type>
- </templateCode>
- </template>
+ <template action="weblog">
+ <name>Weblog</name>
+ <description>weblog</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <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">
+ <name>permalink</name>
+ <description>permalink</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <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">
+ <name>searchresults</name>
+ <description>searchresults</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <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">
+ <name>_day</name>
+ <description>_day</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <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">
+ <name>sidebar</name>
+ <description>sidebar</description>
+ <link></link>
+ <navbar>false</navbar>
+ <hidden>true</hidden>
+ <templateCode>
+ <templateLanguage>velocity</templateLanguage>
+ <contentType>text/html</contentType>
+ <contentsFile>sidebar.vm</contentsFile>
+ <type>standard</type>
+ </templateCode>
+ </template>
+ <!-- resources -->
+ <resource path="images/forward_mobile.png" />
</weblogtheme>
Modified:
roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm?rev=1243255&r1=1243254&r2=1243255&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
Sun Feb 12 14:08:46 2012
@@ -2,27 +2,24 @@
<html>
<head>
<title>$model.weblog.name</title>
-
<meta name="viewport" content="width=device-width, initial-scale=1">
-
<link rel="stylesheet"
href="http://code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css"/>
<script type="text/javascript"
src="http://code.jquery.com/jquery-1.6.2.min.js";></script>
<script type="text/javascript"
src="http://code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js";></script>
</head>
<body>
+
<script type="text/javascript">
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());
+ var c_value = escape(value) + ((exdays == null) ? "" : "; expires=" +
exdate.toUTCString() + "; path=/");
document.cookie = c_name + "=" + c_value;
}
-
-$('#btnStandard').live('vclick' ,function(e){
-setCookie("roller_user_request_type","standard",30)
+setCookie("roller_user_request_type","mobile",30);
+$('#btnStandard').live('vclick' ,function(e) {
+ window.location.href="?deviceType=standard";
});
-
-
</script>
<div data-role="page" id ="home">
@@ -31,27 +28,25 @@ setCookie("roller_user_request_type","st
<h1>$model.weblog.name </h1>
<a href=$url.home data-icon="home" data-theme = "a">Home</a>
<a href="#home" id="btnStandard" data-role="button">View Standard</a>
- </div>
- <!-- /header -->
+ </div> <!-- /header -->
<form id="searchForm" method="get" action="search">
<div data-role="fieldcontain">
<input type="search" name="q" data-inline="true"> <input
type="submit" value="Search" data-inline="true">
</div>
</form>
+
<div data-role="content" data-theme="d">
#set($rootCategory = $model.weblog.getWeblogCategory("nil"))
- #set($pager = $model.getWeblogEntriesPager())
- #showWeblogEntriesPager($pager)
- </div>
- <!-- /content -->
+ #set($pager = $model.getWeblogEntriesPager())
+ #showWeblogEntriesPager($pager)
+ </div> <!-- /content -->
<div data-role="footer" data-theme="b">
<h4>Apache Roller Mobile @ 2011</h4>
- </div>
- <!-- /footer -->
-</div>
-<!-- /page -->
+ </div> <!-- /footer -->
+
+</div> <!-- /page -->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm?rev=1243255&r1=1243254&r2=1243255&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm Sun
Feb 12 14:08:46 2012
@@ -1,49 +1,48 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>$model.weblog.name</title>
- #showAutodiscoveryLinks($model.weblog)
- <link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
-</head>
-<body>
-<script type="text/javascript">
-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());
- document.cookie = c_name + "=" + c_value;
- }
-</script>
-
-<input type="button" value="view Mobile Weblog"
onclick='setCookie("roller_user_request_type","mobile",30)'/>
-
-<div class="content_wrapper">
- <div class="content">
- <h1 class="weblogName">$utils.escapeHTML($model.weblog.name)</h1>
-
- <center>
- #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
- #showWeblogCategoryLinksList($rootCategory false false)
- </center>
-
- ## show next/previous paging controls
- #set($pager = $model.getWeblogEntriesPager())
- <div class="next-previous">
- #showNextPrevEntriesControl($pager)
- </div>
-
- ## show entries
- #showWeblogEntriesPager($pager)
-
- </div>
-</div>
-
-<div class="rightbar_wrapper">
- <div class="rightbar">
- #includeTemplate($model.weblog "sidebar")
- </div>
-</div>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>$model.weblog.name</title>
+ #showAutodiscoveryLinks($model.weblog)
+ <link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
+</head>
+<body>
+<script type="text/javascript">
+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;
+}
+setCookie("roller_user_request_type","standard",30);
+</script>
+
+<div class="content_wrapper">
+ <div class="content">
+ <h1 class="weblogName">$utils.escapeHTML($model.weblog.name)</h1>
+
+ <center>
+ #set($rootCategory = $model.weblog.getWeblogCategory("nil"))
+ #showWeblogCategoryLinksList($rootCategory false false)
+ </center>
+
+ ## show next/previous paging controls
+ #set($pager = $model.getWeblogEntriesPager())
+ <div class="next-previous">
+ #showNextPrevEntriesControl($pager)
+ </div>
+
+ ## show entries
+ #showWeblogEntriesPager($pager)
+
+ </div>
+</div>
+
+<div class="rightbar_wrapper">
+ <div class="rightbar">
+ #includeTemplate($model.weblog "sidebar")
+ </div>
+</div>
+
+</body>
+</html>
