Moved the student<->mentor map on the org home page below the list.
Also fixed the wrong EOL in the home.html template.
Patch by: Mario Ferraro and Lennard de Rijk
Reviewed by: to-be-reviewed
--- a/app/soc/content/css/soc-090708.css Thu Jul 30 13:56:21 2009 +0200
+++ b/app/soc/content/css/soc-090708.css Thu Jul 30 14:00:37 2009 +0200
@@ -392,22 +392,10 @@
min-height:500px;
}
-#extras_left {
- width: 55%;
- left: 0px;
- float: left;
-}
-
-#extras_right {
- width: 43%;
- right: 0px;
- float: right;
-}
-
/* Organization home gmap */
#org_home_map {
height: 500px;
- width: 500px;
+ width: 100%;
}
/* SIDEBAR MENU */
--- a/app/soc/templates/soc/organization/home.html Thu Jul 30 13:56:21 2009 +0200
+++ b/app/soc/templates/soc/organization/home.html Thu Jul 30 14:00:37 2009 +0200
@@ -1,62 +1,58 @@
-{% extends "soc/presence/home.html" %}
-{% comment %}
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-
-{% block scripts %}
-{{ block.super }}
-{% if gmaps_api_key %}
- <script src="http://maps.google.com/maps?file=api&v=2&key={{ gmaps_api_key }}" type="text/javascript"></script>
- <script type="text/javascript" src="/soc/content/js/map-090420.js"></script>
-{% endif %}
-{% endblock %}
-
-{% block body_tag %}
- {% if gmaps_api_key %}
- <body onLoad="org_home_gmap.map_load({{ org_map_data }})" onunload="GUnload()">
- {% else %}
- {{ block.super }}
- {% endif %}
-{% endblock %}
-
-{% block instructions %}
-{{ block.super }}
-{% if not gmaps_api_key %}
-<br /><span class="error">Google Maps API key not present.
-Please insert your key in <a href="/site/edit">Site Settings</a>, Google Maps field.
-</span>
-{% endif %}
-{% endblock %}
-{% block home_extras %}
-{% for list_number in list.lists %}
-<p>
- {% include list.nextList %}
-</p>
-{% endfor %}
-{% comment %}
-<div id="org_home_extras">
- <div id="extras_left">
- {% for list_number in list.lists %}
- <p>
- {% include list.nextList %}
- </p>
- {% endfor %}
- </div>
- <div id="extras_right">
- {% if gmaps_api_key %}
- <div id="org_home_map"></div>
- {% endif %}
- </div>
-</div>
-{% endcomment %}
-{% endblock %}
+{% extends "soc/presence/home.html" %}
+{% comment %}
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+
+{% block scripts %}
+{{ block.super }}
+{% if gmaps_api_key %}
+ <script src="http://maps.google.com/maps?file=api&v=2&key={{ gmaps_api_key }}" type="text/javascript"></script>
+ <script type="text/javascript" src="/soc/content/js/map-090420.js"></script>
+{% endif %}
+{% endblock %}
+
+{% block body_tag %}
+ {% if gmaps_api_key %}
+ <body onLoad="org_home_gmap.map_load({{ org_map_data }})" onunload="GUnload()">
+ {% else %}
+ {{ block.super }}
+ {% endif %}
+{% endblock %}
+
+{% block instructions %}
+{{ block.super }}
+{% if not gmaps_api_key %}
+<br /><span class="error">Google Maps API key not present.
+Please insert your key in <a href="/site/edit">Site Settings</a>, Google Maps field.
+</span>
+{% endif %}
+{% endblock %}
+{% block home_extras %}
+{% for list_number in list.lists %}
+<p>
+ {% include list.nextList %}
+</p>
+{% endfor %}
+<div id="org_home_extras">
+ {% for list_number in list.lists %}
+ <p>
+ {% include list.nextList %}
+ </p>
+ {% endfor %}
+{% comment %}
+ {% if gmaps_api_key %}
+ <div id="org_home_map"></div>
+ {% endif %}
+{% endcomment %}
+</div>
+{% endblock %}