[virtualcommons-svn] commit/vcweb: alllee: still some template issues, getting rid of delegate code
Status: Beta
Brought to you by:
alllee
From: Bitbucket <com...@bi...> - 2011-06-27 23:29:07
|
1 new changeset in vcweb: http://bitbucket.org/virtualcommons/vcweb/changeset/22bd927bc912/ changeset: 22bd927bc912 user: alllee date: 2011-06-28 01:28:54 summary: still some template issues, getting rid of delegate code as it's causing flash-of-unstyled-content badness affected #: 6 files (237 bytes) --- a/vcweb/core/templates/mobile/base.html Sat Jun 25 17:53:05 2011 -0700 +++ b/vcweb/core/templates/mobile/base.html Mon Jun 27 16:28:54 2011 -0700 @@ -10,7 +10,8 @@ <!-- vcweb common js --><script type='text/javascript'> // maintain active button state - $(document).delegate("div:jqmData(role='page')", 'pageshow', function() { + /* + $("body").delegate("div:jqmData(role='page')", 'pageshow', function() { console.debug("window location hash is " + window.location.hash); if (window.location.hash) { $(this).find("div:jqmData(role='navbar') a").each(function() { @@ -23,6 +24,7 @@ }); } }); + */ </script> {% endblock %} </head> --- a/vcweb/lighterprints/templates/lighterprints/mobile/footer.html Sat Jun 25 17:53:05 2011 -0700 +++ b/vcweb/lighterprints/templates/lighterprints/mobile/footer.html Mon Jun 27 16:28:54 2011 -0700 @@ -1,3 +1,3 @@ -<div data-role='footer'> +<div data-role='footer' data-theme='a'> {% include "lighterprints/mobile/navbar.html" %} </div> --- a/vcweb/lighterprints/templates/lighterprints/mobile/full-activity-list.html Sat Jun 25 17:53:05 2011 -0700 +++ b/vcweb/lighterprints/templates/lighterprints/mobile/full-activity-list.html Mon Jun 27 16:28:54 2011 -0700 @@ -1,4 +1,9 @@ {% extends "mobile/divpage.html" %} +{% block header %} +<div data-role='header'> + <h1>All Activities</h1> +</div> +{% endblock header %} {% block page_id %}full-activity-list{% endblock page_id %} {% block content %} --- a/vcweb/lighterprints/templates/lighterprints/mobile/header.html Sat Jun 25 17:53:05 2011 -0700 +++ b/vcweb/lighterprints/templates/lighterprints/mobile/header.html Mon Jun 27 16:28:54 2011 -0700 @@ -1,4 +1,4 @@ -<div data-role='header' data-position='inline'> +<div data-role='header' data-theme='d'><h1>Lighter Footprints</h1></div> --- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html Sat Jun 25 17:53:05 2011 -0700 +++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html Mon Jun 27 16:28:54 2011 -0700 @@ -8,12 +8,13 @@ {% endblock %} {% block header %} -{% include "lighterprints/mobile/header.html" %} +<div data-role='header'> + <h1>Available Activities</h1> +</div> {% endblock header %} {% block content %} <div data-role='content' data-theme='e'> - <h3>Available activities</h3><div class='ui-grid-{{grid_letter}}'> {% for activity, grid_letter in available_activities %} <div class='ui-block-{{grid_letter}}'><button data-theme='b'>{{activity}}</button></div> --- a/vcweb/lighterprints/templates/lighterprints/mobile/navbar.html Sat Jun 25 17:53:05 2011 -0700 +++ b/vcweb/lighterprints/templates/lighterprints/mobile/navbar.html Mon Jun 27 16:28:54 2011 -0700 @@ -1,8 +1,8 @@ <div data-role='navbar'><ul> - <li><a href='#home-screen' data-role='button' data-icon='home' data-transition='fade'>Home</a></li> - <li><a href='#full-activity-list' data-role='button' data-icon='grid' data-transition='fade'>All activities</a></li> - <li><a href='#group-performance' data-role='button' data-icon='group' data-transition='fade'>Group performance</a></li> + <li><a href='#home-screen' data-role='button' class='ui-state-persist' data-icon='home' data-transition='fade'>Home</a></li> + <li><a href='#full-activity-list' data-role='button' class='ui-state-persist' data-icon='grid' data-transition='fade'>All activities</a></li> + <li><a href='#group-performance' data-role='button' class='ui-state-persist' data-icon='info' data-transition='fade'>Group performance</a></li></ul></div> Repository URL: https://bitbucket.org/virtualcommons/vcweb/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |