[geodatastore commit] r19 - in trunk: . js templates

1 view
Skip to first unread message

codesite...@google.com

unread,
Aug 19, 2008, 5:11:05 AM8/19/08
to geodat...@googlegroups.com
Author: pamela.fox
Date: Tue Aug 19 02:10:22 2008
New Revision: 19

Removed:
trunk/templates/readonly.html
Modified:
trunk/app.yaml
trunk/geoserv.py
trunk/html.py
trunk/js/admin.js
trunk/locator.py
trunk/templates/admin.html
trunk/templates/base.html
trunk/templates/locator.html
trunk/templates/mapdisplay.html
trunk/templates/query.html

Log:
Fixed templating system to be more reusable, have a base template and
others extend it. Also added links for all outputs to top bar, and made
sidebar append to top instead of bottom for newly added entries

Modified: trunk/app.yaml
==============================================================================
--- trunk/app.yaml (original)
+++ trunk/app.yaml Tue Aug 19 02:10:22 2008
@@ -4,8 +4,6 @@
api_version: 1

handlers:
-- url: /gen
- script: geoserv.py
- url: /gen/.*
script: geoserv.py
- url: /locate

Modified: trunk/geoserv.py
==============================================================================
--- trunk/geoserv.py (original)
+++ trunk/geoserv.py Tue Aug 19 02:10:22 2008
@@ -292,6 +292,6 @@
[
('/gen/request', Request)
],
- debug=True)
+ debug=False)

wsgiref.handlers.CGIHandler().run(application)

Modified: trunk/html.py
==============================================================================
--- trunk/html.py (original)
+++ trunk/html.py Tue Aug 19 02:10:22 2008
@@ -20,7 +20,7 @@
def get(self):
self.render(self.getTemplateFilename(), self.getTemplateValues())

- def getTemplateValues(self):
+ def getTemplateValues(self, title):
if users.GetCurrentUser():
login_url = users.CreateLogoutURL(self.request.uri)
login_linktext = 'Logout'
@@ -36,7 +36,8 @@
'linktext': login_linktext,
'name': login_name,
'admin': users.is_current_user_admin()
- }
+ },
+ 'title': title
}
return template_values

@@ -53,7 +54,7 @@
##
# Returns a dictionary with values for the template
def getTemplateValues(self):
- template_values = BasePage.getTemplateValues(self)
+ template_values = BasePage.getTemplateValues(self, 'Admin')
return template_values

##
@@ -68,7 +69,7 @@
##
# Returns a dictionary with values for the template
def getTemplateValues(self):
- template_values = BasePage.getTemplateValues(self)
+ template_values = BasePage.getTemplateValues(self, 'Query')
return template_values

##
@@ -83,7 +84,7 @@
##
# Returns a dictionary with values for the template
def getTemplateValues(self):
- template_values = BasePage.getTemplateValues(self)
+ template_values = BasePage.getTemplateValues(self, 'Map')
return template_values

##
@@ -98,7 +99,7 @@
##
# Returns a dictionary with values for the template
def getTemplateValues(self):
- template_values = BasePage.getTemplateValues(self)
+ template_values = BasePage.getTemplateValues(self, 'Locator')
return template_values

##
@@ -112,5 +113,6 @@
('/admin', AdminPage),
('/mapdisplay', MapDisplayPage),
('/locator', LocatorPage),
- ('/query', QueryPage)],debug=True)
+ ('/query', QueryPage)],
+ debug=False)
wsgiref.handlers.CGIHandler().run(application)

Modified: trunk/js/admin.js
==============================================================================
--- trunk/js/admin.js (original)
+++ trunk/js/admin.js Tue Aug 19 02:10:22 2008
@@ -211,10 +211,6 @@
}
me.selected_geometry_ = geometry;
div.style.backgroundColor = '#FFD7AE';
- console.log(div.offsetTop);
- console.log(div.scrollTop);
- console.log(div.style.height);
- console.log(me.dom_.sidebar_div.offsetHeight);
me.dom_.sidebar_div.scrollTop = div.offsetTop -
me.dom_.sidebar_div.offsetHeight/2;
me.updateHighlightPoly_();
});
@@ -485,7 +481,14 @@
}

var sidebar_entry = me.createSidebarEntry_(geometry);
- me.dom_.sidebar_div.appendChild(sidebar_entry);
+ if (me.dom_.sidebar_divs.length > 1) {
+ //me.dom_.sidebar_div.insertBefore(sidebar_entry);
+ var last_sidebar_entry =
me.dom_.sidebar_divs[me.dom_.sidebar_divs.length-2];
+ console.log(last_sidebar_entry);
+ me.dom_.sidebar_div.insertBefore(sidebar_entry, last_sidebar_entry);
+ } else {
+ me.dom_.sidebar_div.appendChild(sidebar_entry);
+ }
geometry.sidebar_entry = sidebar_entry;
if (is_editable) {
GEvent.trigger(geometry.sidebar_entry, 'enableedit');

Modified: trunk/locator.py
==============================================================================
--- trunk/locator.py (original)
+++ trunk/locator.py Tue Aug 19 02:10:22 2008
@@ -83,6 +83,6 @@
[
('/locate', Request),
],
- debug=True)
+ debug=False)

-wsgiref.handlers.CGIHandler().run(application)
\ No newline at end of file
+wsgiref.handlers.CGIHandler().run(application)

Modified: trunk/templates/admin.html
==============================================================================
--- trunk/templates/admin.html (original)
+++ trunk/templates/admin.html Tue Aug 19 02:10:22 2008
@@ -1,24 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>Administration</title>
- <link rel="stylesheet" type="text/css" href="css/geoserver.css"
media="all"/>
+{% extends "base.html" %}
+{% block scripts %}
<script
type="text/javascript"
src="http://maps.google.com/maps?file=api&v=2.x&key=ABQIAAAA-O3c-Om9OcvXMOJXreXHAxRlOb26qSyU154aZeLwOrF4C7-DphSw7JoLuXrcDjUb_7h-S1txkSCY7A"></script>
<script type="text/javascript" src="js/admin.js"></script>
<script type="text/javascript">
- {% if login %}
- var current_user = '{{ login.name }}';
- var is_admin = '{{ login.admin }}';
- {% endif %}
+ window.onload = function() {
+ new geoserver.adminPanel('mapPanel')
+ }
</script>
-</head>
- <body onload="new geoserver.adminPanel('adminPanel')">
- {% if login %}
- {{ login.name }} | <a href="{{ login.url }}">{{login.linktext }}</a>
- {% endif %}
- <div id="adminPanel"></div>
- </body>
-</html>
+{% endblock %}


Modified: trunk/templates/base.html
==============================================================================
--- trunk/templates/base.html (original)
+++ trunk/templates/base.html Tue Aug 19 02:10:22 2008
@@ -2,16 +2,70 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>GeoServer</title>
+ <title>{{ title }}</title>
<link rel="stylesheet" type="text/css" href="css/geoserver.css"
media="all"/>
- <script type="text/javascript" src="js/admin.js"></script>
- </head>
+ {% block scripts %}
+ {% endblock %}
+ <script type="text/javascript">
+ {% if login %}
+ var current_user = '{{ login.name }}';
+ var is_admin = '{{ login.admin }}';
+ {% endif %}
+ </script>
+</head>
<body>
- <div id="controls-top">
+
+<div id="controls-top">
+ <table style="width:100%" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="header" style="width:60%">
+ <span style="font-size: 36px">geo data store</span>
+ </td>
+ <td class="header" style="text-align:right">
{% if login %}
{{ login.name }} | <a href="{{ login.url }}">{{login.linktext }}</a>
{% endif %}
- </div>
- </body>
+ </td>
+ </tr>
+ <tr>
+ <td class="divider" colspan="2">
+ <!-- nothing here! -->
+ </td>
+ </tr>
+ <tr>
+ <td class="subheader" colspan="2">
+ <table>
+ <tr>
+ <td class="sublink" id="sublink0">
+ <a href="admin" id="sublink0a">Admin Map</a></td>
+ <td> | </td>
+ <td class="sublink" id="sublink1">
+ <a href="mapdisplay" id="sublink1a">Map Output</a></td>
+ <td> | </td>
+ <td class="sublink" id="sublink2">
+ <a href="query" id="sublink2a">KML Output</a></td>
+ <td> | </td>
+ <td class="sublink" id="sublink3">
+ <a href="locator" id="sublink3a">Store Locator</a></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+
+<div id="mapPanel">
+{% block content %}
+{% endblock %}
+</div>
+
+<table style="width:100%" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="divider" colspan="2">
+ <!-- nothing here! -->
+ </td>
+</table>
+
+</body>
</html>


Modified: trunk/templates/locator.html
==============================================================================
--- trunk/templates/locator.html (original)
+++ trunk/templates/locator.html Tue Aug 19 02:10:22 2008
@@ -1,61 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>Administration</title>
- <link rel="stylesheet" type="text/css" href="css/geoserver.css"
media="all"/>
+{% extends "base.html" %}
+{% block scripts %}
<script
- type="text/javascript"
src="http://maps.google.com/maps?file=api&v=2.x&key=ABQIAAAA-O3c-Om9OcvXMOJXreXHAxQGj0PqsCtxKvarsoS-iqLdqZSKfxS27kJqGZajBjvuzOBLizi931BUow"></script>
+ type="text/javascript"
src="http://maps.google.com/maps?file=api&v=2.x&key=ABQIAAAA-O3c-Om9OcvXMOJXreXHAxRlOb26qSyU154aZeLwOrF4C7-DphSw7JoLuXrcDjUb_7h-S1txkSCY7A"></script>
<script type="text/javascript" src="js/readonly.js"></script>
<script type="text/javascript" src="js/locator.js"></script>
<script type="text/javascript">
- {% if login %}
- var current_user = '{{ login.name }}';
- {% endif %}
+ window.onload = function() {
+ new geoserver.mapDisplay('mapPanel')
+ }
</script>
-</head>
- <body onload="new geoserver.mapDisplay('mapPanel')">
- <div id="controls-top">
- <table style="width:100%" cellpadding="0" cellspacing="0">
-<tr>
-<td class="header" style="width:60%">
-<span style="font-size: 36px">geo data store</span>
-</td>
-<td class="header" style="text-align:right">
- {% if login %}
- {{ login.name }} | <a href="{{ login.url }}">{{login.linktext }}</a>
- {% endif %}
-</td>
-</tr>
-<tr>
-<tr>
-<td class="divider" colspan="2">
-<!-- nothing here! -->
-</td>
-</tr>
-<tr>
-<td class="subheader" colspan="2">
-<table>
- <tr>
- <td class="sublink" id="sublink0">
- <a href="admin" id="sublink0a">Map Admin Panel</a></td>
- <td> | </td>
- <td class="sublink" id="sublink1">
- <a href="query" id="sublink1a">KML Output</a></td>
- </tr>
-
-</table>
-</td>
-</tr>
-</table>
- </div>
- <div id="mapPanel"></div>
-<table style="width:100%" cellpadding="0" cellspacing="0">
-<tr>
-<td class="divider" colspan="2">
-<!-- nothing here! -->
-</td>
-</table>
- </body>
-</html>
+{% endblock %}


Modified: trunk/templates/mapdisplay.html
==============================================================================
--- trunk/templates/mapdisplay.html (original)
+++ trunk/templates/mapdisplay.html Tue Aug 19 02:10:22 2008
@@ -1,59 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>Administration</title>
- <link rel="stylesheet" type="text/css" href="css/geoserver.css"
media="all"/>
+{% extends "base.html" %}
+{% block scripts %}
<script
- type="text/javascript"
src="http://maps.google.com/maps?file=api&v=2.x&key=ABQIAAAA-O3c-Om9OcvXMOJXreXHAxQGj0PqsCtxKvarsoS-iqLdqZSKfxS27kJqGZajBjvuzOBLizi931BUow"></script>
+ type="text/javascript"
src="http://maps.google.com/maps?file=api&v=2.x&key=ABQIAAAA-O3c-Om9OcvXMOJXreXHAxRlOb26qSyU154aZeLwOrF4C7-DphSw7JoLuXrcDjUb_7h-S1txkSCY7A"></script>
<script type="text/javascript" src="js/readonly.js"></script>
<script type="text/javascript">
- {% if login %}
- var current_user = '{{ login.name }}';
- {% endif %}
+ window.onload = function() {
+ new geoserver.mapDisplay('mapPanel')
+ }
</script>
-</head>
- <body onload="new geoserver.mapDisplay('adminPanel')">
- <div id="controls-top">
- <table style="width:100%" cellpadding="0" cellspacing="0">
-<tr>
-<td class="header" style="width:60%">
-<span style="font-size: 36px">geo data store</span>
-</td>
-<td class="header" style="text-align:right">
- {% if login %}
- {{ login.name }} | <a href="{{ login.url }}">{{login.linktext }}</a>
- {% endif %}
-</td>
-</tr>
-<tr>
-<tr>
-<td class="divider" colspan="2">
-<!-- nothing here! -->
-</td>
-</tr>
-<td class="subheader" colspan="2">
-<table>
- <tr>
- <td class="sublink" id="sublink0">
- <a href="admin" id="sublink0a">Map Admin Panel</a></td>
- <td> | </td>
- <td class="sublink" id="sublink1">
- <a href="query" id="sublink1a">KML Output</a></td>
- </tr>
-
-</table>
-</td>
-</tr>
-</table>
- </div>
- <div id="adminPanel"></div>
-<table style="width:100%" cellpadding="0" cellspacing="0">
-<tr>
-<td class="divider" colspan="2">
-<!-- nothing here! -->
-</td>
-</table>
- </body>
-</html>
+{% endblock %}


Modified: trunk/templates/query.html
==============================================================================
--- trunk/templates/query.html (original)
+++ trunk/templates/query.html Tue Aug 19 02:10:22 2008
@@ -1,49 +1,6 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>Administration</title>
- <link rel="stylesheet" type="text/css" href="css/geoserver.css"
media="all"/>
- <script type="text/javascript">
- {% if login %}
- var current_user = '{{ login.name }}';
- {% endif %}
- </script>
-</head>
- <body>
- <div id="controls-top">
- <table style="width:100%" cellpadding="0" cellspacing="0">
-<tr>
-<td class="header" style="width:60%">
-<span style="font-size: 36px">geo data store</span>
-</td>
-<td class="header" style="text-align:right">
- {% if login %}
- {{ login.name }} | <a href="{{ login.url }}">{{login.linktext }}</a>
- {% endif %}
-</td>
-</tr>
-<tr>
-<tr>
-<td class="divider" colspan="2">
-<!-- nothing here! -->
-</td>
-</tr>
-<td class="subheader" colspan="2">
-<table>
- <tr>
- <td class="sublink" id="sublink0">
- <a href="admin" id="sublink0a">Map Admin Panel</a></td>
- <td> | </td>
- <td class="sublink" id="sublink1">
- <a href="query" id="sublink1a">KML Output</a></td>
- </tr>
-
-</table>
-</td>
-</tr>
-</table>
- </div>
+{% extends "base.html" %}
+{% block content %}
+ </div>
<div style="font-size: 13px">
<br/>
You can also retrieve the output of the geo-tagged DataStore as KML.
Here are some example queries:
@@ -54,12 +11,6 @@
<br/>
<br/><br/><br/>
</div>
-<table style="width:100%" cellpadding="0" cellspacing="0">
-<tr>
-<td class="divider" colspan="2">
-<!-- nothing here! -->
-</td>
-</table>
- </body>
-</html>
+
+{% endblock %}

Reply all
Reply to author
Forward
0 new messages