Skip to content

Commit

Permalink
Commiting fix from Tiger Gui to improve the standard to mobile page s…
Browse files Browse the repository at this point in the history 
…witch button and logic:

https://issues.apache.org/jira/browse/ROL-1937

git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1243255 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@snoopdave
snoopdave committed Feb 12, 2012
1 parent f46fc45 commit 541e232
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 175 deletions.
10 changes: 8 additions & 2 deletions ...src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
View file
Expand Up @@ -49,6 +49,7 @@ public enum DeviceType { standard, mobile };
+ "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";

/**
*
Expand All @@ -65,12 +66,17 @@ public static boolean isMobileDevice(HttpServletRequest request) {

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;
}
Expand Down
7 changes: 7 additions & 0 deletions weblogger-webapp/src/main/webapp/themes/basic/basic-custom.css
View file
Expand Up @@ -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;
}
Binary file added weblogger-webapp/src/main/webapp/themes/basic/images/forward_mobile.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions weblogger-webapp/src/main/webapp/themes/basic/sidebar.vm
View file
@@ -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")
Expand Down
212 changes: 107 additions & 105 deletions weblogger-webapp/src/main/webapp/themes/basic/theme.xml
View file
@@ -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="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="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="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>_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="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>
33 changes: 14 additions & 19 deletions weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
View file
Expand Up @@ -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">
Expand All @@ -31,27 +28,25 @@ setCookie("roller_user_request_type","standard",30)
<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>
</html>

0 comments on commit 541e232

Please sign in to comment.