[virtualcommons-svn] commit/vcweb: alllee: minor updates to templating, moving on to scheduling

[Bitbucket <com...@bi...>]

1 new changeset in vcweb:

http://bitbucket.org/virtualcommons/vcweb/changeset/553037a68117/
changeset:   553037a68117
user:        alllee
date:        2011-06-30 00:38:03
summary:     minor updates to templating, moving on to scheduling
affected #:  5 files (546 bytes)

--- a/vcweb/core/templates/mobile/base.html	Tue Jun 28 12:17:53 2011 -0700
+++ b/vcweb/core/templates/mobile/base.html	Wed Jun 29 15:38:03 2011 -0700
@@ -33,7 +33,7 @@
         <div data-role='page' id='{% block page_id %}home{% endblock %}'>
             {% block header %}
             <div data-role='header' data-position='inline'>
-                <h1>vcmobile</h1>
+                <h1>{{experiment|default:"vcweb mobile"}}</h1></div>
             {% endblock header %}
             {% block content %}


--- a/vcweb/core/templates/mobile/divpage.html	Tue Jun 28 12:17:53 2011 -0700
+++ b/vcweb/core/templates/mobile/divpage.html	Wed Jun 29 15:38:03 2011 -0700
@@ -1,10 +1,16 @@
 <div data-role='page' id='{% block page_id %}home{% endblock %}'>
     {% block header %}
-    {% include "lighterprints/mobile/header.html" %}
+    <div data-role='header' data-position='inline'>
+        <h1>{{experiment.title|default:"vcweb experiment"}}</h1>
+    </div>
     {% endblock header %}
     {% block content %}
     {% endblock content %}
     {% block footer %}
-    {% include "lighterprints/mobile/footer.html" %}
+    <div data-role='footer'>
+        <h4>
+            This project is funded by the <a href='http://nsf.gov'>National Science Foundation</a> and <a href='http://www.asu.edu'>Arizona State University</a>.
+        </h4>
+    </div> 
     {% endblock footer %}
 </div>


--- a/vcweb/lighterprints/models.py	Tue Jun 28 12:17:53 2011 -0700
+++ b/vcweb/lighterprints/models.py	Wed Jun 29 15:38:03 2011 -0700
@@ -17,6 +17,10 @@
     def label(self):
         return self.display_name if self.display_name else self.name
 
+    @property
+    def icon_name(self):
+        return self.name
+
     def __unicode__(self):
         return u'%s (+%s)' % (self.label, self.savings)
 


--- a/vcweb/lighterprints/templates/lighterprints/mobile/full-activity-list.html	Tue Jun 28 12:17:53 2011 -0700
+++ b/vcweb/lighterprints/templates/lighterprints/mobile/full-activity-list.html	Wed Jun 29 15:38:03 2011 -0700
@@ -13,10 +13,15 @@
         <h3>Level {{level}} Activities</h3><div class='ui-grid-d'>
             {% for activity, grid_letter in activities %}
-            <div class='ui-block-{{grid_letter}}'><button data-theme='e'>{{ activity }}</button></div>
+            <div class='ui-block-{{grid_letter}}'><button data-icon='{{activity.icon_name}}' data-iconpos='top' data-theme='e'>{{ activity }}</button></div>
             {% endfor %}
         </div></div>
     {% endfor %}
 </div>
 {% endblock %}
+
+{% block footer %}
+{% include "lighterprints/mobile/footer.html" %}
+{% endblock footer %}
+


--- a/vcweb/lighterprints/templates/lighterprints/mobile/index.html	Tue Jun 28 12:17:53 2011 -0700
+++ b/vcweb/lighterprints/templates/lighterprints/mobile/index.html	Wed Jun 29 15:38:03 2011 -0700
@@ -17,7 +17,7 @@
 <div data-role='content' data-theme='e'><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>
+        <div class='ui-block-{{grid_letter}}'><button data-icon='{{activity.icon_name}}' data-iconpos='top' data-theme='b'>{{activity}}</button></div>
         {% endfor %}
     </div></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.