commit 7549d16f4ddaa6a03407064d71dcafb30c89183f
Author: Olga Brani <olgabrani@grnet.gr>
Date:   Wed Mar 27 15:34:49 2013 +0200

    Branding cleanup & overview page
    
    Removing unnecessary code ( branding tags). Generic overview page.

diff --git a/snf-astakos-app/astakos/im/templates/im/base.html b/snf-astakos-app/astakos/im/templates/im/base.html
index ef02d6c..90a28d7 100644
--- a/snf-astakos-app/astakos/im/templates/im/base.html
+++ b/snf-astakos-app/astakos/im/templates/im/base.html
@@ -1,4 +1,4 @@
-{% load astakos_tags branding_tags %}<!doctype html>
+{% load astakos_tags %}<!doctype html>
 <html>
 <head>
   {% block starthead %}{% endblock starthead %}
diff --git a/snf-astakos-app/astakos/im/templates/im/landing.html b/snf-astakos-app/astakos/im/templates/im/landing.html
index 1244eb4..920daf0 100644
--- a/snf-astakos-app/astakos/im/templates/im/landing.html
+++ b/snf-astakos-app/astakos/im/templates/im/landing.html
@@ -1,55 +1 @@
-{% extends "im/account_base.html" %}
-
-{% load filters %}
-{% block page.title %}Overview{% endblock %}
-
-{% block page.body %}
-<div class="landing-page">
-	
-	<div class="two-cols clearfix dotted pithos">
-		<div class="rt">
-    		<a href="/pithos/ui/"><img class="pic" src="{{ IM_STATIC_URL }}images/landing-pithos.png" /></a>
-		</div>
-		<div class="lt">
-			<a href="/pithos/ui/">Pithos</a> is the File Storage service. Click to start
-uploading and managing your files on the cloud.
-
-		</div>
-	</div>
-	<div class="two-cols clearfix dotted cyclades">
-		<div class="rt">
-  			<a href="/ui/"><img class="pic" src="{{ IM_STATIC_URL }}images/landing-cyclades.png" /></a>
-		</div>
-		<div class="lt">
-			<a href="/ui/">Cyclades</a> is the Compute and Network Service. Click to start
-creating Virtual Machines and connect them to arbitrary Networks.
-
-		</div>
-	</div>
-	<div class="two-cols clearfix dotted dashboard">
-		<div class="rt">
-    		<a href="{% url astakos.im.views.edit_profile %}"><img class="pic" src="{{ IM_STATIC_URL }}images/landing-dashboard.png" /></a>
-		</div>
-		<div class="lt">
-			Access the <a href="{% url astakos.im.views.edit_profile %}">dashboard</a> from
-the top right corner of your screen. Here you can manage your profile, see the usage of your resources
-and manage projects to share virtual resources with colleagues.
-
-		</div>
-	</div>
-	<div class="two-cols clearfix dotted cms">
-		<div class="rt">
-    		<a href=""><img class="pic" src="{{ IM_STATIC_URL }}images/landing-cms.png" /></a>
-		</div>
-		<div class="lt">
-			Click on the top left logo icon, to go back to the homepage.
- 
-		</div>
-	</div>
-</div>
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('body').append('<div id="hand">&nbsp;</div>');
-	});
-</script>	
-{% endblock %}
+{% extends "im/landing_base.html" %}
\ No newline at end of file
diff --git a/snf-astakos-app/astakos/im/templates/im/landing_base.html b/snf-astakos-app/astakos/im/templates/im/landing_base.html
new file mode 100644
index 0000000..764cad3
--- /dev/null
+++ b/snf-astakos-app/astakos/im/templates/im/landing_base.html
@@ -0,0 +1,26 @@
+{% extends "im/account_base.html" %}
+
+{% load filters %}
+{% block page.title %}Overview{% endblock %}
+
+{% block page.body %}
+<div class="landing-page">
+	{% block content%}
+		{% for service in services %}
+			<div class="two-cols clearfix dotted">
+				<div class="rt">
+					<a href="{{ service.url }}">
+						<img class="pic" src="{{ service.landing_image }}" />
+					</a>
+				</div>
+				<div class="lt">
+					<h2>{{ service.name }}</h2>
+					{{ service.description }}
+				</div>
+			</div>
+		{% endfor %}
+	{% endblock content %}
+	 
+</div>	
+	 
+{% endblock %}
diff --git a/snf-astakos-app/astakos/im/templates/im/projects/intro_base.html b/snf-astakos-app/astakos/im/templates/im/projects/intro_base.html
index 1f543a0..f380472 100644
--- a/snf-astakos-app/astakos/im/templates/im/projects/intro_base.html
+++ b/snf-astakos-app/astakos/im/templates/im/projects/intro_base.html
@@ -3,7 +3,7 @@
 {% block intro_top %}{% endblock intro_top %}
 
 <div class="widjets"> 
-  <!--<a href="#" class="widjet-x" title="remove boxes">X</a>-->
+  
   <ul class="clearfix"> 
     <li class="create">
     <div>
diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py
index 18ef151..aa28521 100644
--- a/snf-astakos-app/astakos/im/views.py
+++ b/snf-astakos-app/astakos/im/views.py
@@ -1584,11 +1584,12 @@ def project_app_dismiss(request, application_id, ctx=None):
 
 
 def landing(request):
+    services = get_services_dict()
     return render_response(
         'im/landing.html',
+        services = services,
         context_instance=get_context(request))
 
-
 def api_access(request):
     return render_response(
         'im/api_access.html',
diff --git a/snf-branding/synnefo_branding/templatetags/__init__.py b/snf-branding/synnefo_branding/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/snf-branding/synnefo_branding/templatetags/branding_tags.py b/snf-branding/synnefo_branding/templatetags/branding_tags.py
deleted file mode 100644
index 2ce79b8..0000000
--- a/snf-branding/synnefo_branding/templatetags/branding_tags.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2011 GRNET S.A. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
-#
-#   1. Redistributions of source code must retain the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer.
-#
-#   2. Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and
-# documentation are those of the authors and should not be
-# interpreted as representing official policies, either expressed
-# or implied, of GRNET S.A.
-
- 
-from django import template
-from synnefo_branding import settings, utils
- 
-register = template.Library()
-
-@register.simple_tag
-def get_branding_image_url(image_name):
-
-    # kpap: edw kati den paei kala, evala to MEDIA_URL kai sto settings pali
-    media_path = settings.IMAGE_MEDIA_URL
-    # pontio alla pws alliws na to ekana?
-    image = image_name.split('.')[0]
-    dct = utils.get_branding_dict()
-    branding_image_url = media_path+image_name
-
-    for key, value in dct.iteritems(): 
-        if key.startswith(image):
-            if dct[key]!= '':
-                branding_image_url = dct[key]
-
-    return branding_image_url
\ No newline at end of file
diff --git a/snf-cyclades-app/synnefo/ui/static/generic_info_tpl.html b/snf-cyclades-app/synnefo/ui/static/generic_info_tpl.html
index 1e804bf..e3d8c88 100644
--- a/snf-cyclades-app/synnefo/ui/static/generic_info_tpl.html
+++ b/snf-cyclades-app/synnefo/ui/static/generic_info_tpl.html
@@ -1,5 +1,3 @@
-{% load branding_tags %}
-
 <!doctype html>
 <html> 
 <head> 
diff --git a/snf-cyclades-app/synnefo/ui/static/service_unavailable.html b/snf-cyclades-app/synnefo/ui/static/service_unavailable.html
index c381b3f..1ceba03 100644
--- a/snf-cyclades-app/synnefo/ui/static/service_unavailable.html
+++ b/snf-cyclades-app/synnefo/ui/static/service_unavailable.html
@@ -1,5 +1,3 @@
-{% load branding_tags %}
-
 <!doctype html>
 <html> 
 <head> 
diff --git a/snf-cyclades-app/synnefo/ui/templates/home.html b/snf-cyclades-app/synnefo/ui/templates/home.html
index 03b46f0..f2c5333 100644
--- a/snf-cyclades-app/synnefo/ui/templates/home.html
+++ b/snf-cyclades-app/synnefo/ui/templates/home.html
@@ -1,4 +1,3 @@
-{% load branding_tags %}
 <!doctype html>
 <html>
 
diff --git a/snf-cyclades-app/synnefo/ui/templates/machines_console.html b/snf-cyclades-app/synnefo/ui/templates/machines_console.html
index 033c336..5c6f0d7 100644
--- a/snf-cyclades-app/synnefo/ui/templates/machines_console.html
+++ b/snf-cyclades-app/synnefo/ui/templates/machines_console.html
@@ -32,7 +32,6 @@ documentation are those of the authors and should not be
 interpreted as representing official policies, either expressed
 or implied, of GRNET S.A.
 -->
-{% load branding_tags %}
 {% load i18n %}
 
 <html>
