# HG changeset patch # User Mario Ferraro # Date 1248955237 -7200 # Node ID c76c9c5916bd8daf9f989944ed68824f6b865c6e # Parent 9c7d31b8247c281a6391613d358ac5ab29d2078d 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 diff -r 9c7d31b8247c -r c76c9c5916bd app/soc/content/css/soc-090708.css --- 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 */ diff -r 9c7d31b8247c -r c76c9c5916bd app/soc/templates/soc/organization/home.html --- 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 %} - - -{% endif %} -{% endblock %} - -{% block body_tag %} - {% if gmaps_api_key %} - - {% else %} - {{ block.super }} - {% endif %} -{% endblock %} - -{% block instructions %} -{{ block.super }} -{% if not gmaps_api_key %} -
Google Maps API key not present. -Please insert your key in Site Settings, Google Maps field. - -{% endif %} -{% endblock %} -{% block home_extras %} -{% for list_number in list.lists %} -

- {% include list.nextList %} -

-{% endfor %} -{% comment %} -
-
- {% for list_number in list.lists %} -

- {% include list.nextList %} -

- {% endfor %} -
-
- {% if gmaps_api_key %} -
- {% endif %} -
-
-{% 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 %} + + +{% endif %} +{% endblock %} + +{% block body_tag %} + {% if gmaps_api_key %} + + {% else %} + {{ block.super }} + {% endif %} +{% endblock %} + +{% block instructions %} +{{ block.super }} +{% if not gmaps_api_key %} +
Google Maps API key not present. +Please insert your key in Site Settings, Google Maps field. + +{% endif %} +{% endblock %} +{% block home_extras %} +{% for list_number in list.lists %} +

+ {% include list.nextList %} +

+{% endfor %} +
+ {% for list_number in list.lists %} +

+ {% include list.nextList %} +

+ {% endfor %} +{% comment %} + {% if gmaps_api_key %} +
+ {% endif %} +{% endcomment %} +
+{% endblock %}