Commit 373b0188 authored by Olga Brani's avatar Olga Brani

Initial branding for service and company

New synnefo_branding app.
Service name defaults to "Synnefo" and company name defaults to "grnet".
Branding is applicable to texts containing Service or Company name/url and to 
images such as  favicon, compute, dashboard and console logos.
parent 7b3067c0
......@@ -84,7 +84,7 @@ PROFILE_MESSAGES = getattr(settings, 'ASTAKOS_PROFILE_MESSAGES', [])
GLOBAL_MESSAGES = getattr(settings, 'ASTAKOS_GLOBAL_MESSAGES', [])
# messages to display as extra actions in account forms
# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'}
# e.g. {'https://www.myhomepage.com': 'Back to <service_name>'}
PROFILE_EXTRA_LINKS = getattr(settings, 'ASTAKOS_PROFILE_EXTRA_LINKS', {})
# The number of unsuccessful login requests per minute allowed for a specific user
......@@ -363,4 +363,4 @@ LINKEDIN_SECRET = getattr(settings, 'ASTAKOS_LINKEDIN_SECRET', '')
# Where to redirect the user after successful login when no next parameter is
# set
LOGIN_SUCCESS_URL = getattr(settings, 'ASTAKOS_LOGIN_SUCCESS_URL',
'/im/landing')
'/im/landing')
\ No newline at end of file
......@@ -41,6 +41,7 @@ img.right { margin:0 0 1em 1em; float:right;}
/* container */
.container .wrapper { padding-bottom:100px;}
.mainlogo h1 { line-height:100%; font-size:1em; }
.mainlogo img { max-width:100%; max-height:300px; }
.container .navigation { margin:20px 0 0; font-size:1.154em; height:95px;}
.container .navigation ul { margin:5px 0; padding:0;}
.container .navigation ul + ul { font-size:0.933em; }
......
......@@ -44,6 +44,7 @@ installed_apps = [
'django.contrib.sessions',
'django.contrib.messages',
'django_tables2',
'synnefo_branding',
# 'debug_toolbar',
]
......@@ -60,7 +61,7 @@ context_processors = [
'astakos.im.context_processors.menu',
'astakos.im.context_processors.custom_messages',
'astakos.im.context_processors.last_login_method',
'astakos.im.context_processors.membership_policies',
'astakos.im.context_processors.membership_policies',
'synnefo.lib.context_processors.cloudbar'
]
......
......@@ -2,7 +2,7 @@
{% load filters %}
{% block page.title %}Profile{% endblock %}
{% block page.title %}Overview{% endblock %}
{% block page.nav.classes %}{% endblock %}
{% block page.quicknav.items %}
......
{% load astakos_tags %}<!doctype html>
{% load astakos_tags branding_tags %}<!doctype html>
<html>
<head>
{% block starthead %}{% endblock starthead %}
<meta charset="UTF-8">
......@@ -6,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="{{ resource.meta.compatibility }}">
<title>
{% block page.title %}Accounts{% endblock %} / GRNET Cloud Accounts
{{ BRANDING_SERVICE_NAME }} Dashboard | {% block page.title %}Overview{% endblock %}
</title>
<meta name="description" content="">
......@@ -21,7 +22,7 @@
{% endblock %}
{% block page.favicons %}
<link rel="shortcut icon" href="">
<link rel="shortcut icon" href="{{ BRANDING_FAVICON_URL }}" />
<link rel="apple-touch-icon" href="">
{% endblock page.favicons %}
......@@ -78,13 +79,12 @@
<body>
<div class="container">
<div class="wrapper">
<div class="wrapper">
{% display_messages %}
<div class="mainlogo">
<a href="{% url astakos.im.views.index %}">
<img src="{{ IM_STATIC_URL }}images/accounts-logo.png" alt="accounts" />
<a href="{% url index %}">
<img src="{{ BRANDING_DASHBOARD_LOGO_URL }}" alt="{{ BRANDING_SERVICE_NAME }} Dashboard" />
</a>
</div>
{% block page.nav %}
......
{% extends "im/account_base.html" %}
{% load astakos_tags i18n %}
{% block page.title %}Contact{% endblock %}
{% block body %}
<h2>CONTACT US </h2>
<p>If you would like to contact us for any reason, please feel free to
<h2>{% trans "CONTACT US" %} </h2>
<p>
If you would like to contact us for any reason, please feel free to
write <br>your message in the following form. Feedback and suggestions are<br>
also highly appreciated. </p>
also highly appreciated.</p>
<form action="{% url feedback %}" method="post"
class="withlabels">{% csrf_token %}
......
{% block footer_content %}
<p class="termslink" style="float:right"><a href="{% url latest_terms %}">Terms of service</a></p>
<p>Copyright 2011-2012 <a href="http://www.grnet.gr" target="_blank" title="GRNET S.A.">GRNET S.A.</a> All rights reserved.</p>
<p>Copyright {{ BRANDING_COPYRIGHT_PERIOD }} <a href="{{ BRANDING_COMPANY_URL }}" target="_blank" title="{{ BRANDING_COMPANY_NAME }}">{{ BRANDING_COMPANY_NAME_FORMAL }}</a> All rights reserved.</p>
{% endblock %}
......
......@@ -3,7 +3,6 @@
{% load filters %}
{% block page.body %}
<h2>HOW IT WORKS</h2>
<div class="centered how-it-works">
<div class="wrap">
......
{% extends "im/account_base.html" %}
{% load filters %}
{% block page.title %}Overview{% endblock %}
{% block page.body %}
<div class="landing-page">
......
{% extends 'im/base_two_cols.html'%}
{% block signup_class %}hidden{% endblock %}
{% block page.title %}Login{% endblock %}
{% block body.left %}
<img class="pic" src="{{ IM_STATIC_URL }}images/porta.png" />
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %}
{% block body.right %}
......
{% extends "im/account_base.html" %}
{% block page.title %}Profile{% endblock %}
{% block headjs %}
{{ block.super }}
<script src="{{ IM_STATIC_URL }}js/auth_methods.js"></script>
......
{% extends "im/account_base.html" %}
{% block body %}
<form action={%url edit_profile %} method="post" class="withlabels hidden-submit">{% csrf_token %}
{% with profile_form as form %}
{% include "im/form_render.html" %}
{% endwith %}
<div class="form-row submit">
<input type="hidden" name="next" value="{{ next }}">
<input type="hidden" name="auth" value="{{ user.auth_token }}">
<input type="submit" class="submit altcol" value="UPDATE" />
</div>
<div class="auth_methods">
<br /><br />
<div class="assigned">
<h2><a href="#">Available authentication methods</a></h2>
<p>You can login to your account using the following methods</p>
<ul class="auth_providers">
{% for provider in user_providers %}
<li>
<h2>
{{ provider.settings.title }}
<span class="actions" style="margin-left: 40px">
{% for name, url in provider.settings.extra_actions %}
<a href="{{ url }}" title="{{ name }}">{{ name }}</a>
{% endfor %}
{% if provider.can_remove %}
<a href="{% url remove_auth_provider provider.pk %}" title="disble">Remove</a>
{% endif %}
</span>
</h2>
<p>{{ provider.details_display }}</p>
<br />
</li>
{% empty %}
<li>No available authentication methods</li>
{% endfor %}
</ul>
</div>
<div class="notassigned">
<p>You can add the following authentication methods to your account </p>
<ul class="auth_providers">
{% for provider in user_available_providers %}
<li>
<h2><a href="{{ provider.add_url }}">{{ provider.title }}</a></h2>
<p>{{ provider.add_description }}</p>
<br />
</li>
{% empty %}
No available providers.
{% endfor %}
</ul>
</div>
</div>
</form>
<div class="two-cols-links">
<p><a href="{% url password_change %}">Change Password</a></p>
<p>
<a href="https://okeanos.grnet.gr/home/">Back to ~okeanos</a>
<a href="https://cyclades.okeanos.grnet.gr/ui/">Take me to cyclades</a>
<a href="https://pithos.okeanos.grnet.gr/ui/">Take me to pithos+</a>
</p>
</div>
{% endblock body %}
{% extends "im/projects/intro_base.html" %}
{% load i18n %}
{% block intro_top %}
<div class="two-cols clearfix">
<div class="rt">
&nbsp;
......@@ -6,52 +8,12 @@
<div class="lt">
<p>
{% blocktrans %}
~okeanos gives the opportunity to
{{ BRANDING_SERVICE_NAME }} gives the opportunity to
Greek Academic or Research Organizations/Institutions/Faculty
to run their own projects remotely on virtual infrastructure.
Simple, fast, and with minimal to no cost at all.
{% endblocktrans %}
{% endblocktrans %}
</p>
<p><a href="{% url how_it_works %}" style="font-size:1.154em;">How it works ></a></p>
</div>
</div>
<div class="widjets">
<!--<a href="#" class="widjet-x" title="remove boxes">X</a>-->
<ul class="clearfix">
<li class="create">
<div>
<div class="wrap">
<p class="centered"><a href="{% url project_add %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
<p class="txt">
{% blocktrans %}
Create a new Project. Name it, describe its purpose,
choose virtual resources to be granted to members, and submit.
Your application will be reviewed, and if accepted,
you and your colleagues are ready to deploy!<br/><br/>
{% endblocktrans %}
</p>
<p><a href="{% url project_add %}">create a project ></a></p>
</div>
</div>
</li>
<li class="join">
<div>
<div class="wrap">
<p class="centered"><a href="{% url project_search %}"><img alt="THINK ABOUT IT" src="/static/im/images/join.png"></a></p>
<p class="txt">
{% blocktrans %}
Request to be a member of an existing Project
and instantly gain access to the resources it has to offer you.
Search for public Projects, or submit a join request to a private Project,
if you think its administrators will accept you.
In short: try to Join now.
{% endblocktrans %}
</p>
<p><a href="{% url project_search %}">join a project ></a></p>
</div>
</div>
</li>
</ul>
</div>
{% endblock %}
\ No newline at end of file
{% load i18n %}
{% 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>
<div class="wrap">
<p class="centered"><a href="{% url project_add %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
<p class="txt">
{% blocktrans %}
Create a new Project. Name it, describe its purpose,
choose virtual resources to be granted to members, and submit.
Your application will be reviewed, and if accepted,
you and your colleagues are ready to deploy!<br/><br/>
{% endblocktrans %}
</p>
<p><a href="{% url project_add %}">create a project ></a></p>
</div>
</div>
</li>
<li class="join">
<div>
<div class="wrap">
<p class="centered"><a href="{% url project_search %}"><img alt="THINK ABOUT IT" src="/static/im/images/join.png"></a></p>
<p class="txt">
{% blocktrans %}
Request to be a member of an existing Project
and instantly gain access to the resources it has to offer you.
Search for public Projects, or submit a join request to a private Project,
if you think its administrators will accept you.
In short: try to Join now.
{% endblocktrans %}
</p>
<p><a href="{% url project_search %}">join a project ></a></p>
</div>
</div>
</li>
</ul>
</div>
{% extends "im/account_base.html" %}
{% block page.subnav %}
<li><a href="../">Overview</a></li>
<li class="active"><a href="#">Create</a></li>
<li><a href="../join/">Join</a></li>
{%endblock %}
{% block body %}
<div class="projects">
<div class="clearfix">
<p>You can create the followind type of projects:</p>
</div>
<div class="two-cols clearfix dotted">
<div class="rt centered">
<img alt="THINK ABOUT IT" src="/static/medialibrary/2012/04/proffessor.png">
</div>
<div class="lt">
<h2 style="color:#B66D00;">COURSE</h2>
<div>
<p>You wake up one morning and you need a new computer with a specific operating system and hardware requirements (or 10 new computers). You also need 10GB of storage space to store some new content you just got your hands on (or 50GB ;-)).</p>
<a href="course/" class="submit">CREATE COURSE</a>
</div>
</div>
</div>
<div class="two-cols clearfix dotted">
<div class="rt centered">
<img alt="THINK ABOUT IT" src="/static/medialibrary/2012/06/behind_okeanos.png">
</div>
<div class="lt">
<h2 style="color:#4085A6;">PROJECT</h2>
<div>
<p>You wake up one morning and you need a new computer with a specific operating system and hardware requirements (or 10 new computers). You also need 10GB of storage space to store some new content you just got your hands on (or 50GB ;-)).</p>
<a href="#" class="submit">CREATE PROJECT</a>
</div>
</div>
</div>
<div class="two-cols clearfix dotted">
<div class="rt centered">
<img alt="THINK ABOUT IT" src="/static/medialibrary/2012/06/from_athens.png">
</div>
<div class="lt">
<h2 style="color:#EF4F54;">ORGANISATION</h2>
<div>
<p>You wake up one morning and you need a new computer with a specific operating system and hardware requirements (or 10 new computers). You also need 10GB of storage space to store some new content you just got your hands on (or 50GB ;-)).</p>
<a href="#" class="submit">CREATE ORGANISATION</a>
</div>
</div>
</div>
<div class="two-cols clearfix dotted">
<div class="rt centered">
<img alt="THINK ABOUT IT" src="/static/medialibrary/2012/04/researcher.png">
</div>
<div class="lt">
<h2 style="color:#FF7CA4;">LAB</h2>
<div>
<p>You wake up one morning and you need a new computer with a specific operating system and hardware requirements (or 10 new computers). You also need 10GB of storage space to store some new content you just got your hands on (or 50GB ;-)).</p>
<a href="{% url group_add 'laboratory' %}" class="submit">CREATE LAB</a>
</div>
</div>
</div>
</div>
{% endblock body %}
{% extends "im/account_base.html" %}
{% load astakos_tags filters django_tables2 %}
{% block page.title %}Projects{% endblock %}
{% block page.body %}
<div class="maincol {% block innerpage.class %}{% endblock %}">
<div class="projects">
......
......@@ -15,7 +15,7 @@
{% if not show_form %}
<p>These are the specifications of the Project you want to create. If you hit the "Submit" button
this form will be officially sent to GRNET for review. Please make sure the following reflect
this form will be officially sent to {{ BRANDING_COMPANY_NAME }} for review. Please make sure the following reflect
exactly your request.</p>
{% endif %}
......@@ -29,7 +29,7 @@ exactly your request.</p>
<em>more info</em>
<span> To create a new Project, first enter the following
required fields. The information you enter, except
<i>Comments for review</i>, will be visible to all ~okeanos
<i>Comments for review</i>, will be visible to all {{ BRANDING_SERVICE_NAME }}
users. </span>
</span>
</legend>
......
......@@ -7,6 +7,8 @@
<script src="{{ IM_STATIC_URL }}js/usage.js"></script>
{% endblock %}
{% block page.title %}Usage{% endblock %}
{% block page.body %}
<div class="maincol {% block innerpage.class %}{% endblock %}">
<h2>RESOURCE USAGE</h2>
......
<div class="section">
<h2>GRNET SERVICES</h2>
<!--<p>
There will be some text here explaining about what i am signing up for
right? There will be some text here explaining about what i am signing up for
right? There will be some text here explaining about what i am signing up for
right?
</p>-->
</div>
<div class="section service-desc okeanos">
<h2>
<img class="pic" src="{{ IM_STATIC_URL }}images/service_okeanos_logo.png" />
</h2>
<!--<p>
There will be some text here explaining about what i am signing up for
right? There will be some text here explaining about what i am signing up for
right? There will be some text here explaining about what i am signing up for
right?
</p>-->
</div>
<div class="section service-desc">
<h2>
<img class="pic" src="{{ IM_STATIC_URL }}images/service_pithos_logo.png" />
</h2>
<!--<p>
There will be some text here explaining about what i am signing up for
right? There will be some text here explaining about what i am signing up for
right? There will be some text here explaining about what i am signing up for
right?
</p>-->
</div>
......@@ -13,7 +13,6 @@
<img class="pic" src="{{ IM_STATIC_URL }}images/ringer1.png" />
{% endif %}
</div>
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %}
{% block body.right %}
......
......@@ -6,7 +6,6 @@
{% block body.left %}
<img class="pic" src="{{ IM_STATIC_URL }}images/pictures/accounts_3.png" />
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %}
{% block body.right %}
......
......@@ -8,7 +8,6 @@ Password reset
<div class="section">
<img class="pic" src="{{ IM_STATIC_URL }}images/break_glass.jpeg" />
</div>
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %}
{% block body.right %}
......
......@@ -205,5 +205,4 @@ def provider_login_url(context, provider, from_login=False):
if "?" in url:
joinchar = "&"
return "%s%s%s" % (provider.add_url, joinchar, urllib.urlencode(attrs))
return "%s%s%s" % (provider.add_url, joinchar, urllib.urlencode(attrs))
\ No newline at end of file
<h1>Okeanos terms</h1>
<h1>Synnefo terms</h1>
<div class="date">Last modified: 22 Feb 2012</div>
<p>
You must follow any policies made available to you within the Services.
......@@ -42,7 +42,7 @@ announcements, administrative messages, and other information. You may opt out
of some of those communications.
</p>
<h3>1.1.1 Terms heading</h1>
<h3>1.1.1 Terms heading</h3>
<p>
Our Services display some content that is not Google’s. This content is the
sole responsibility of the entity that makes it available. We may review
......
Copyright 2013 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.
Changelog
---------
v0.1.0
*******
* Initial release
include README Changelog
include distribute_setup.py
README
=======
synnefo_branding app
This diff is collapsed.
# 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.
#
import distribute_setup
distribute_setup.use_setuptools()
import os
from setuptools import setup, find_packages
HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
from synnefo_branding.version import __version__
# Package info
VERSION = __version__
README = open(os.path.join(HERE, 'README')).read()
CHANGES = open(os.path.join(HERE, 'Changelog')).read()
SHORT_DESCRIPTION = 'Synnefo stats grapher'
PACKAGES_ROOT = '.'
PACKAGES = find_packages(PACKAGES_ROOT)
# Package meta
CLASSIFIERS = []
# Package requirements
INSTALL_REQUIRES = [
]
setup(
name='snf-branding-app',
version=VERSION,
license='BSD',
url='http://www.synnefo.org/',
description=SHORT_DESCRIPTION,
long_description=README + '\n\n' + CHANGES,
classifiers=CLASSIFIERS,
author='Synnefo development team',
author_email='synnefo-devel@googlegroups.com',
maintainer='Synnefo development team',
maintainer_email='synnefo-devel@googlegroups.com',
packages=PACKAGES,
package_dir={'': PACKAGES_ROOT},
include_package_data=True,
zip_safe=False,
install_requires=INSTALL_REQUIRES,