From 0ed04dcd8532d39866fff8e030b3678944a3f203 Mon Sep 17 00:00:00 2001 From: Lennard de Rijk Date: Tue, 21 Apr 2009 16:24:32 +0000 Subject: [PATCH] Added map of accepted student proposals to mentors to the org home page. Patch by: Madhusudan C.S Reviewed by: Lennard de Rijk --- app/soc/content/css/soc-090418.css | 25 +++++++++++++++++++ app/soc/templates/soc/organization/home.html | 37 ++++++++++++++++++++++++++-- app/soc/templates/soc/presence/home.html | 1 + 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/app/soc/content/css/soc-090418.css b/app/soc/content/css/soc-090418.css index fe88522b..0fa01fa2 100644 --- a/app/soc/content/css/soc-090418.css +++ b/app/soc/content/css/soc-090418.css @@ -334,6 +334,31 @@ table#queues td { width: 320px; } +#org_home_extras { + position: relative; + margin:2em 0em 2em; + min-height:500px; +} + +#extras_left { + position: absolute; + width: 55%; + left: 0px; +} + +#extras_right { + position: absolute; + width: 43%; + right: 0px; + float: right; +} + +/* Organization home gmap */ +#org_home_map { + height: 500px; + width: 500px; +} + /* SIDEBAR MENU */ #side { width: 200px; diff --git a/app/soc/templates/soc/organization/home.html b/app/soc/templates/soc/organization/home.html index 86f45dd1..d667f926 100644 --- a/app/soc/templates/soc/organization/home.html +++ b/app/soc/templates/soc/organization/home.html @@ -13,11 +13,44 @@ See the License for the specific language governing permissions and limitations under the License. {% endcomment %} -{% block body %} - {{ block.super }} +{% 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 %} +
+
+ {% if gmaps_api_key %} +
+ {% endif %} +
+
{% endblock %} diff --git a/app/soc/templates/soc/presence/home.html b/app/soc/templates/soc/presence/home.html index e36d2908..3eeb94f5 100644 --- a/app/soc/templates/soc/presence/home.html +++ b/app/soc/templates/soc/presence/home.html @@ -55,6 +55,7 @@ limitations under the License. This is the default home page, it can be edited via Edit {{ entity_type }} Settings.
{% endblock %} {% endif %} + {% block home_extras %}{% endblock %} {% if entity.feed_url %}
{% endif %} -- 2.11.4.GIT