Because we will focus on Responsive Design to support mobile devices,…

… we are removing jQuery Mobile support. It also means that the html code is easier and lighter
peta15 · May 25, 2012 · 29ddae5 · 29ddae5
1 parent 7978909
commit 29ddae5
Show file tree

Hide file tree

Showing 24 changed files with 117 additions and 338 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -14,10 +14,10 @@ Try it online {here}[http:https://appengine.protoboard.cl].
 
 
 == Just 5 easy steps
-1. Download the last version of the {App Engine SDK}[http:https://code.google.com/appengine/downloads.html#Google_App_Engine_SDK_for_Python] for Linux, Mac OS or Windows (Tested with SDK version 1.6.4).
+1. Download the last version of the {App Engine SDK}[http:https://code.google.com/appengine/downloads.html#Google_App_Engine_SDK_for_Python] for Linux, Mac OS or Windows (Tested with SDK version 1.6.6).
 1. Download the code of this Boilerplate ({here}[https://github.com/coto/gae-boilerplate/zipball/master])
 1. Run locally ({instructions}[https://developers.google.com/appengine/docs/python/tools/devserver]).
-1. Change to your 'application' name in {app.yaml}[https://github.com/coto/gae-boilerplate/blob/master/app.yaml]
+1. Use your 'application' name in {app.yaml}[https://github.com/coto/gae-boilerplate/blob/master/app.yaml]
 1. Deploy it to your own app ({instructions}[https://developers.google.com/appengine/docs/python/gettingstarted/uploading])
 
 
@@ -27,7 +27,8 @@ Try it online {here}[http:https://appengine.protoboard.cl].
 - Update User Profile (developing)
 - Automatic Language Detection
 - Contact Form (getting information for logged user)
-- Device identification (Automatically it uses the amazing Twitter-Bootstrap Template for Desktop and jQuery Mobile for Tablets and Smartphones)
+- Responsive Design (using the amazing Twitter-Bootstrap Template)
+- Device identification (Mobile or Desktop)
 
 
 == Open Source
@@ -42,7 +43,7 @@ http:https://appengine.protoboard.cl
 
 == Technologies used
 * Python 2.7
-* {NDB 1.0}[http:https://code.google.com/p/appengine-ndb-experiment/] (A new datastore API for the Google App Engine Python runtime).
+* {NDB 1.0.1}[http:https://code.google.com/p/appengine-ndb-experiment/] (A new datastore API for the Google App Engine Python runtime).
 * {Jinja2}[http:https://jinja.pocoo.org/docs/] (A full featured template engine for Python).
 * {webapp2}[http:https://webapp-improved.appspot.com/] (A lightweight Python web framework compatible with Google App Engine).
  * webapp2_extras.sessions
@@ -55,10 +56,9 @@ http:https://appengine.protoboard.cl
 
 == Front-end Technologies
 * {HTML5Boilerplate}[http:https://html5boilerplate.com/] with {Modernizr 2.5.3}[http:https://modernizr.com]
-* jQuery 1.7.1 and jQuery Mobile 1.1.0
+* jQuery 1.7.2
 * {Twitter Bootstrap 2.0.3}[http:https://twitter.github.com/bootstrap/] Template for Desktop Version.
 
 
 
-
 Hope it works for you!! :)
diff --git a/app.yaml b/app.yaml
@@ -50,9 +50,6 @@ handlers:
  mime_type: text/css
  static_dir: static/css
 
-- url: /mobile
- static_dir: static/mobile/1.1.0
-
 - url: /js
  mime_type: text/javascript
  static_dir: static/js

diff --git a/lib/languages.py b/lib/languages.py
@@ -15,8 +15,6 @@
 en["menu_fyp"] = "Forgot your password?"
 en["menu_glogin"] = "Login with Google Account"
 en["menu_opensource"] = "Source Code"
-en["menu_version_desk"] = "Desktop Version"
-en["menu_version_mob"] = "Mobile Version"
 
 en["spanish"] = u"Español"
 en["english"] = "English"
@@ -48,7 +46,6 @@
 en["text_oldbrowser"] = '<p class=chromeframe>Your browser is <em>ancient!</em> <a href="http:https://browsehappy.com/">Upgrade to a different browser</a> or <a href="http:https://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p>'
 
 
-
 ## spanish dict
 
 es = {}
@@ -64,8 +61,6 @@
 es["menu_fyp"] = u"Olvidó su contraseña?"
 es["menu_glogin"] = u"Login con Cuenta Google"
 es["menu_opensource"] = u"Código fuente"
-es["menu_version_desk"] = u"Versión Escritorio"
-es["menu_version_mob"] = u"Versión Móvil"
 
 es["spanish"] = u"Español"
 es["english"] = u"English"
@@ -112,8 +107,6 @@
 it["menu_fyp"] = "Password dimenticata?"
 it["menu_glogin"] = "Login con l'account Google"
 it["menu_opensource"] = "Codice sorgente"
-it["menu_version_desk"] = "Versione Desktop"
-it["menu_version_mob"] = "Versione Mobile"
 
 it["spanish"] = u"Español"
 it["english"] = "English"
@@ -159,8 +152,6 @@
 cn["menu_fyp"] = u"忘记密码？"
 cn["menu_glogin"] = u"登录Google帐户"
 cn["menu_opensource"] = u"源代码"
-cn["menu_version_desk"] = u"桌面版"
-cn["menu_version_mob"] = u"移动版"
 
 cn["spanish"] = u"Espa&ntilde;ol"
 cn["english"] = u"English"

diff --git a/static/css/main.css b/static/css/main.css
@@ -11,20 +11,8 @@
  display: block;
 }
 
-/* Jquery Validate */
-
 label.error {
  color: red;
  padding: .4em 0;
  display: block;
-}
-
-.ui-page.ui-body-c {
- background: #FFFFFF;
- background-image: -webkit-gradient(linear,left top,left bottom,from(#FFF),to(#FFF));
- background-image: -webkit-linear-gradient(#FFF,#FFF);
- background-image: -moz-linear-gradient(#FFF,#FFF);
- background-image: -ms-linear-gradient(#FFF,#FFF);
- background-image: -o-linear-gradient(#FFF,#FFF);
- background-image: linear-gradient(#FFF,#FFF);
 }
diff --git a/static/js/libs/jquery-1.7.1.min.js b/static/js/libs/jquery-1.7.1.min.js
diff --git a/static/js/libs/jquery-1.7.2.min.js b/static/js/libs/jquery-1.7.2.min.js
diff --git a/static/mobile/1.1.0/images/ajax-loader.gif b/static/mobile/1.1.0/images/ajax-loader.gif
diff --git a/static/mobile/1.1.0/images/ajax-loader.png b/static/mobile/1.1.0/images/ajax-loader.png
diff --git a/static/mobile/1.1.0/images/icons-18-black.png b/static/mobile/1.1.0/images/icons-18-black.png
diff --git a/static/mobile/1.1.0/images/icons-18-white.png b/static/mobile/1.1.0/images/icons-18-white.png
diff --git a/static/mobile/1.1.0/images/icons-36-black.png b/static/mobile/1.1.0/images/icons-36-black.png
diff --git a/static/mobile/1.1.0/images/icons-36-white.png b/static/mobile/1.1.0/images/icons-36-white.png
diff --git a/static/mobile/1.1.0/jquery.mobile-1.1.0.min.css b/static/mobile/1.1.0/jquery.mobile-1.1.0.min.css
diff --git a/static/mobile/1.1.0/jquery.mobile-1.1.0.min.js b/static/mobile/1.1.0/jquery.mobile-1.1.0.min.js
diff --git a/templates/base.html b/templates/base.html
@@ -26,13 +26,11 @@
  })();
  </script>
  {% if is_mobile %}
- <link rel="stylesheet" href="/mobile/jquery.mobile-1.1.0.min.css" />
- {% else %}
  <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+ {% endif %}
  <link rel="stylesheet" href="/css/style.css" />
  <link rel="stylesheet" href="/css/bootstrap.min.css">
  <link rel="stylesheet" href="/css/bootstrap-responsive.min.css">
- {% endif %}
  <link rel="stylesheet" href="/css/main.css" />
 
  {% block mediaCSS %}{% endblock %}
@@ -46,37 +44,31 @@
  chromium.org/developers/how-tos/chrome-frame-getting-started -->
  <!--[if lt IE 7]>{{ lang.text_oldbrowser|safe }}<![endif]-->
 
- <div data-role="page" data-theme="c">
+ <div>
  {% block header %}
- <header data-role="header" class="jumbotron subhead" id="overview">
+ <header class="subhead" id="overview">
  <h1>{% block header_content_title %}{% endblock %}</h1>
- {% if is_mobile %}
- <a href="/" data-role="button" data-icon="home" data-iconpos="notext">
- <i class="icon-home"></i> {{ lang.menu_home|safe }}
- </a>
- {% else %}
- {% block header_content_lead %}
- <p class="lead">
- <ul class="breadcrumb">
- <li>
- <i class="icon-home"></i> <a href="/">{{ lang.menu_home|safe }}</a> <span class="divider">/</span>
- </li>
- <!--li class="active">Data</li-->
- </ul>
- </p>
- {% endblock %}
- {% endif %}
+ {% block header_content_lead %}
+ <p class="lead">
+ <ul class="breadcrumb">
+ <li>
+ <i class="icon-home"></i> <a href="/">{{ lang.menu_home|safe }}</a> <span class="divider">/</span>
+ </li>
+ <!--li class="active">Data</li-->
+ </ul>
+ </p>
+ {% endblock %}
  </header>
  {% endblock %}
 
- <div data-role="content" class="container">
+ <div class="container">
  <p class="alert alert-{{ level }}">
  <a class="close" data-dismiss="alert">×</a>
  {{ messages|safe }}
  </p>
 
  {% block content %}{% endblock %}
- <div data-role="fieldcontain">
+ <div>
  <label for="select_language" class="select">{{ lang.text_language|safe }}:</label>
  <select name="select_language" id="select_language">
  <option value="es" {% if lang.id == "es" %}selected="selected"{% endif %}>{{ lang.spanish|safe }}</option>
@@ -88,26 +80,17 @@ <h1>{% block header_content_title %}{% endblock %}</h1>
  </div><!-- /content -->
 
  {% block footer %}
- <footer data-role="footer" class="ui-bar">
- <a href="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/coto/gae-boilerplate" class="btn btn-success" target="_blank" data-role="button" data-icon="gear">{{ lang.menu_opensource|safe }}</a>
- {% if is_mobile %}
- <a href="{{ path }}?device=desktop" class="btn btn-success" data-ajax="false" data-role="button" data-icon="plus">{{ lang.menu_version_desk|safe }}</a>
- {% else %}
- <a href="{{ path }}?device=mobile" class="btn btn-success" data-ajax="false" data-role="button" data-icon="plus">{{ lang.menu_version_mob|safe }}</a>
- {% endif %}
+ <footer>
+ <a href="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/coto/gae-boilerplate" class="btn btn-success" target="_blank">{{ lang.menu_opensource|safe }}</a>
  </footer>
  {% endblock %}
  </div><!-- /page -->
  <!-- JavaScript at the bottom for fast page loading -->
 
  <!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
- <script src="//code.jquery.com/jquery-1.7.1.min.js"></script>
- <script>window.jQuery || document.write('<script src="/js/libs/jquery-1.7.1.min.js"><\/script>')</script>
- {% if is_mobile %}
- <script src="/mobile/jquery.mobile-1.1.0.min.js"></script>
- {% else %}
+ <script src="//code.jquery.com/jquery-1.7.2.min.js"></script>
+ <script>window.jQuery || document.write('<script src="/js/libs/jquery-1.7.2.min.js"><\/script>')</script>
  <script src="/js/libs/bootstrap.min.js"></script>
- {% endif %}
 
  <!-- scripts concatenated and minified via build script -->
  <script src="/js/plugins.js"></script>

diff --git a/templates/boilerplate_contact.html b/templates/boilerplate_contact.html
@@ -6,45 +6,45 @@
 
 {% block content %}
 
- <form id="form_contact" action="{{ action }}" method="post" class="ui-body ui-body-c well" data-ajax="false">
+ <form id="form_contact" action="{{ action }}" method="post" class="well">
 
- <div data-role="fieldcontain">
+ <div>
  <label for="name">{{ lang.field_name|safe }}:</label>
  <input type="text" name="name" id="name" placeholder="{{ lang.enter_your|safe }} {{ lang.field_name|safe }}" value="{{ name }}" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="email">{{ lang.field_email|safe }}:</label>
  <input type="email" name="email" id="email" placeholder="{{ lang.enter_your|safe }} {{ lang.field_email|safe }}" class="required email" value="{{ email }}" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="message">{{ lang.field_message|safe }}:</label>
- <textarea cols="40" rows="8" name="message" id="message" data-role="none" class="required"></textarea>
+ <textarea cols="40" rows="8" name="message" id="message" class="required"></textarea>
  </div>
 
- <button type="submit" class="btn btn-primary" data-theme="b">{{ lang.button_contact|safe }}</button>
+ <button type="submit" class="btn btn-primary">{{ lang.button_contact|safe }}</button>
 
  </form>
 
- <ul data-role="listview" data-divider-theme="b" data-inset="true" class="nav nav-tabs nav-stacked">
- <li data-role="list-divider" role="heading">
+ <ul class="nav nav-tabs nav-stacked">
+ <li>
  {{ lang.menu_components|safe }}
  </li>
- <li data-theme="c">
- <a href="/login" data-transition="slide">{{ lang.menu_login|safe }}</a>
+ <li>
+ <a href="/login">{{ lang.menu_login|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/create" data-transition="slide">{{ lang.menu_create_user|safe }}</a>
+ <li>
+ <a href="/create">{{ lang.menu_create_user|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/secure" data-transition="slide">{{ lang.menu_secure|safe }}</a>
+ <li>
+ <a href="/secure">{{ lang.menu_secure|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/password-reset/" data-transition="slide">{{ lang.menu_fyp|safe }}</a>
+ <li>
+ <a href="/password-reset/">{{ lang.menu_fyp|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/google-login" data-transition="slide">{{ lang.menu_glogin|safe }}</a>
+ <li>
+ <a href="/google-login">{{ lang.menu_glogin|safe }}</a>
  </li>
  </ul>
 

diff --git a/templates/boilerplate_create_user.html b/templates/boilerplate_create_user.html
@@ -6,39 +6,39 @@
 
 {% block content %}
 
- <form id="form_create_user" action="{{ action }}" method="post" class="ui-body ui-body-c well" data-ajax="false">
+ <form id="form_create_user" action="{{ action }}" method="post" class="well">
 
- <div data-role="fieldcontain">
+ <div>
  <label for="username">{{ lang.field_username|safe }}:</label>
  <input type="text" name="username" id="username" placeholder="{{ lang.enter_your|safe }} {{ lang.field_username|safe }}" class="required" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="name">{{ lang.field_name|safe }}:</label>
  <input type="text" name="name" id="name" placeholder="{{ lang.enter_your|safe }} {{ lang.field_name|safe }}" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="last_name">{{ lang.field_lastname|safe }}:</label>
  <input type="text" name="last_name" id="last_name" placeholder="{{ lang.enter_your|safe }} {{ lang.field_lastname|safe }}" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="email">{{ lang.field_email|safe }}:</label>
  <input type="email" name="email" id="email" placeholder="{{ lang.enter_your|safe }} {{ lang.field_email|safe }}" class="required email" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="password">{{ lang.field_password|safe }}:</label>
  <input type="password" name="password" id="password" placeholder="{{ lang.enter_your|safe }} {{ lang.field_password|safe }}" class="required" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="c_password">{{ lang.field_cpassword|safe }}:</label>
  <input type="password" name="c_password" id="c_password" placeholder="{{ lang.enter_your|safe }} {{ lang.field_password|safe }}" class="required" />
  </div>
 
- <div data-role="fieldcontain">
+ <div>
  <label for="country" class="select">{{ lang.field_country|safe }}:</label>
  <select name="country" id="country">
  <option value="">{{ lang.field_country|safe }}...</option>
@@ -291,28 +291,28 @@
  </select>
  </div>
 
- <button type="submit" class="btn btn-primary" data-theme="b">{{ lang.menu_create_user|safe }}</button>
+ <button type="submit" class="btn btn-primary">{{ lang.menu_create_user|safe }}</button>
 
  </form>
 
- <ul data-role="listview" data-divider-theme="b" data-inset="true" class="nav nav-tabs nav-stacked">
- <li data-role="list-divider" role="heading">
+ <ul class="nav nav-tabs nav-stacked">
+ <li>
  {{ lang.menu_components|safe }}
  </li>
- <li data-theme="c">
- <a href="/login" data-transition="slide">{{ lang.menu_login|safe }}</a>
+ <li>
+ <a href="/login">{{ lang.menu_login|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/contact" data-transition="slide">{{ lang.menu_contact|safe }}</a>
+ <li>
+ <a href="/contact">{{ lang.menu_contact|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/secure" data-transition="slide">{{ lang.menu_secure|safe }}</a>
+ <li>
+ <a href="/secure">{{ lang.menu_secure|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/password-reset/" data-transition="slide">{{ lang.menu_fyp|safe }}</a>
+ <li>
+ <a href="/password-reset/">{{ lang.menu_fyp|safe }}</a>
  </li>
- <li data-theme="c">
- <a href="/google-login" data-transition="slide">{{ lang.menu_glogin|safe }}</a>
+ <li>
+ <a href="/google-login">{{ lang.menu_glogin|safe }}</a>
  </li>
  </ul>