You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sh...@apache.org on 2011/08/21 16:31:26 UTC
svn commit: r1159989 - in /roller/branches/roller_mobile:
weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/
weblogger-webapp/src/main/webapp/WEB-INF/velocity/
weblogger-webapp/src/main/webapp/themes/basic/
Author: shelan
Date: Sun Aug 21 14:31:26 2011
New Revision: 1159989
URL: http://svn.apache.org/viewvc?rev=1159989&view=rev
Log:
Added type switching capability based on cookie set by user for preffered type
Added:
roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm
- copied, changed from r1159525, roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searcresults-mobile.vm
Removed:
roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searcresults-mobile.vm
Modified:
roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm
Modified: roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java?rev=1159989&r1=1159988&r2=1159989&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java (original)
+++ roller/branches/roller_mobile/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java Sun Aug 21 14:31:26 2011
@@ -18,6 +18,10 @@
package org.apache.roller.weblogger.ui.rendering.mobile;
+import org.omg.CORBA.Request;
+import sun.tools.tree.ThisExpression;
+
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
public class MobileDeviceRepository {
@@ -49,6 +53,8 @@ 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";
+
/**
*
* ToCheck if a request is mobile.
@@ -64,6 +70,11 @@ public class MobileDeviceRepository {
public static String getRequestType(HttpServletRequest request) {
String type = "standard";
+ String cookie =getCookieValue(request.getCookies(), USER_REQUEST_TYPE,null);
+
+ if(cookie != null){
+ return cookie;
+ }
if (isMobileDevice(request)) {
type = "mobile";
@@ -71,4 +82,15 @@ public class MobileDeviceRepository {
return type;
}
+ private static String getCookieValue(Cookie[] cookies,
+ String cookieName,
+ String defaultValue) {
+ for (int i = 0; i < cookies.length; i++) {
+ Cookie cookie = cookies[i];
+ if (cookieName.equals(cookie.getName()))
+ return (cookie.getValue());
+ }
+ return (defaultValue);
+ }
+
}
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1159989&r1=1159988&r2=1159989&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/WEB-INF/velocity/weblog.vm Sun Aug 21 14:31:26 2011
@@ -895,5 +895,20 @@ Include Javascript code needed for expan
#end
+#macro(_Jave $type)
+<script type="text/javascript">
+ var type = '$type';
+ 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;
+ }
+ setCookie("roller_user_request_type", type, 30);
+
+</script>
+#end
+
+
Copied: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm (from r1159525, roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searcresults-mobile.vm)
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm?p2=roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm&p1=roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searcresults-mobile.vm&r1=1159525&r2=1159989&rev=1159989&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searcresults-mobile.vm (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm Sun Aug 21 14:31:26 2011
@@ -17,8 +17,6 @@
<a data-rel="back" data-icon="back" data-theme = "a">back</a>
<a href=$url.home data-icon="home" data-theme = "a">Home</a>
</div>
-
-<h3> no of results found : $model.hits</h3>
<br>
<h3> Search Results for '$model.term' </h3>
#set($pager = $model.getWeblogEntriesPager())
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm?rev=1159989&r1=1159988&r2=1159989&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm Sun Aug 21 14:31:26 2011
@@ -10,13 +10,27 @@
<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());
+ document.cookie = c_name + "=" + c_value;
+ }
-<div data-role="page">
+$('#btnStandard').live('vclick' ,function(e){
+setCookie("roller_user_request_type","standard",30)
+});
+
+
+</script>
+
+<div data-role="page" id ="home">
<div data-role="header" data-theme="b">
<h1>$model.weblog.name </h1>
<a href=$url.home data-icon="home" data-theme = "a">Home</a>
- <a data-rel="back" data-icon="back" data-theme = "a">Go back</a>
+ <a href="#home" id="btnStandard" data-role="button">View Standard</a>
</div>
<!-- /header -->
Modified: roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm?rev=1159989&r1=1159988&r2=1159989&view=diff
==============================================================================
--- roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm Sun Aug 21 14:31:26 2011
@@ -7,6 +7,16 @@
<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">