Revision e7a2ac21

b/snf-astakos-app/astakos/im/static/im/css/formating.css
29 29
a span											{ cursor:pointer; }
30 30
abbr[title], dfn[title]							{ border-bottom:1px dotted; cursor:help; }
31 31
address											{ font-style:italic; margin:0 0 1.5em 0; }
32
body											{ background:white; color:#222; font-family: Antic, Arial, sans-serif; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px; }
32
body											{ background:white; color:#222; font-family: Antic, Arial, sans-serif; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px;}
33 33
code, kbd, pre, samp							{ font-family:monospace, sans-serif; }
34 34
del												{ text-decoration:line-through; }
35 35
dl												{ margin:1em 0; }
......
39 39
h1, h2, h3, h4, h5, h6							{ font-weight:bold; line-height:1.4; margin-bottom:0; }
40 40
/* Typographic scale based on 12px body size */
41 41
h1												{ font-size:4em; }
42
h2												{ font-size:1.231em; }
43
h3												{ font-size:1.154em; }
42
h2												{ font-size:1em; }
43
h3												{ font-size:1em; }
44 44
h4												{ font-size:1.5em; }
45 45
h5												{ font-size:1.333em; }
46 46
h6												{ font-size:1.167em; }
b/snf-astakos-app/astakos/im/static/im/css/forms.css
24 24
form .form-row .extra-link 					{ color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:42px;   float: right; }
25 25
form .form-row .extra-link:hover			{ text-decoration:underline;}
26 26
form .form-row label 						{ font-size: 1.1em; }
27
form.innerlabels label 						{ position: absolute; top: 1.1em; left: 1.5em; color: #808080 ; }
27
form.innerlabels label 						{ position: absolute; top: 12px; left: 1.5em; color: #808080 ; }
28 28
form.innerlabels p 							{ margin:0; position: relative;}
29 29
form.innerlabels p.p15px					{ font-size:1.154em;}
30 30
form.innerlabels p.p15px a					{ margin:0 5px;}
......
65 65
form .with-errors textarea, 
66 66
form .with-errors select 					{ color: #9d261d;}
67 67
form .with-errors label 					{ color: #e4776f; }
68
.form-error 								{ color:red; font-style:italic; font-size: 0.8em; padding: 5px 5px; }
68
.form-error 								{ color:red;   font-size: 0.8em; padding: 5px 5px; }
69 69
.form-errors.all .form-error 				{ position: relative; border-radius: 0; margin-bottom: 1.3em; padding: 0.5em; }
70 70
div.form-stacked 							{ margin-bottom: 4em; }
71 71
.checkbox-widget.checked 					{ background-color: #FF0000; background-image: url("../images/checkbox.png"); background-position: 50% 50%; }
......
76 76
form span.info								{ position:absolute;z-index:10; top:10px;  left: 290px; }
77 77
form span.info em 							{ display:block; overflow:hidden;  position:absolute; left:0; text-indent:-100px; top:0; height:21px; width:21px; background:url(../images/symbols.png) no-repeat -4px -31px;cursor:pointer; }
78 78
form span.info:hover em 					{ background-position:-4px -3px; }
79
form span.info span  						{ position:absolute; left:29px; top:-2px; width:150px; padding-left:55px; background:url(../images/black-line.jpg ) no-repeat left 12px; min-height:50px; display:none; }
79
form span.info span  						{ position:absolute; left:29px; top:-2px; width:120px; padding-left:30px; background:url(../images/black-line.jpg ) no-repeat left 12px; min-height:50px; display:none; font-size:0.846em;}
80 80
form span.info:hover span 					{ display:block; }
81 81
form .with-errors span.info					{ display:none;}
82 82
form p										{ margin-bottom:0;position:relative;}
83
form input[readonly=true] 					{ background-color: #ddd; color: #5e5e5e; }
83
form input[readonly=true] 					{ /*background-color: #ddd;*/ color: #5e5e5e; }
84 84
#recaptcha_area 							{ margin-top:20px; } 
85 85
form.innerlabels .with-checkbox .checkbox-widget 	{ margin-top:15px; }
86
form.innerlabels .with-checkbox .checkbox-label		{ left:2.5em; }
86
form.innerlabels .with-checkbox .checkbox-label		{ left:2.5em; top:17px; }
87 87

  
88 88
form .extra-img								{ display:block; width:21px; height:21px; overflow:hidden;  position:absolute; left:440px;top:10px; z-index:101;}
89 89
form .with-errors .extra-img 				{ background:url(../images/symbols.png) no-repeat -58px -3px;}
b/snf-astakos-app/astakos/im/static/im/css/ie7.css
7 7
img												{ -ms-interpolation-mode:bicubic; }
8 8

  
9 9
.clearfix										{ zoom:1; }
10
.container .navigation ul li						{ display:inline;}
11
.lt .box-more ul.col								{ display:inline;}
10
.container .navigation ul li					{ display:inline;}
11
.lt .box-more ul.col							{ display:inline;}
12

  
13
form input.text, 
14
form input[type="text"],
15
form input[type="password"]						{ margin-bottom:-3px;}
b/snf-astakos-app/astakos/im/static/im/css/modules.css
1 1
.wrapper                                        { margin:0 auto; position:relative; width:820px; padding:36px 70px; }
2 2
.container .wrapper,
3 3
.footer .wrapper                                { border: 1px solid #808080; border-top:0 none;}
4
.footer .wrapper								{ padding:20px 70px 25px; }
4 5
.centered                                       { text-align:center;}
5 6
img.left						                { margin:0 1em 1em 0; float:left;}
6 7
img.right						                { margin:0 0 1em 1em; float:right;}
7 8

  
8

  
9
/* header */
10
.header                                         { background:#000; color:#fff;	 height:35px; line-height:35px; }	
11
.header .wrapper                                { width:auto; padding:0;}			
12
.header a                                       { color:#fff; text-decoration:none;}
13
.header .profile                                { float:right; background:#01A1AE; min-width:150px; padding:0 20px; text-align:right;  }
14
.header .profile a                              { text-decoration:none; color:#fff; }
15
.header .profile ul                             { position:absolute;   right:0; top:35px; padding:0; margin:0;  width:190px; display:none;	z-index:9; background:#fff;}
16
.header .profile ul li                          { list-style:none outside; line-height:35px; padding:0 20px;}
17
.header .profile ul li:hover a					{ color:#01A1AE;}
18
.header .profile:hover ul                       { display:block; }
19
.header .profile .full a                        { padding-right:20px; background:url(../images/arrow-white.png) no-repeat right center;}
20
.header .profile .full ul 						{ border:1px dashed #000; border-top:0 none; border-right:0 none;}
21
.header .profile ul li a                        { padding-right:0; background:none; color:#000;}
22
.header ul.services                             { margin:0; padding:0; }
23
.header ul.services li                          { float:left; height:35px; line-height:35px; text-align:center; padding: 0 30px; list-style:none outside;}
24
.header ul.services li:first-child              { padding:0 5px;}
25
.header ul.services li.active                   { background:#333;}
26
.header ul.services li:hover                    { background:#444; } 
27

  
28

  
9
 
29 10
/* footer */
30 11
.footer                                         { font-size:0.923em;color:#B3B3B3; }
31 12
.footer a                                       { color:#B3B3B3; text-decoration:none; transition:color 0.15s ease-in-out 0s; -moz-transition: color 0.15s ease-in-out 0s;  -webkit-transition: color 0.15s ease-in-out 0s;  -o-transition: color 0.15s ease-in-out 0s; } 
32 13
.footer:hover a                                 { color:#808080;}
33 14
.footer a:hover                                 { color:#000;}
34 15
.footer ul                                      { float:left; margin:0 0 0 22px; width:140px;  padding:0;}
35
.footer ul li                                   { padding:0; margin:0 0 0.5em 0; list-style:none outside;}
16
.footer ul li                                   { padding:0; margin:0; list-style:none outside;}
36 17
.footer ul li:first-child                       { margin-bottom:1em;	}
37 18
.footer .clearfix                               { padding-bottom:20px;}
38 19
.footer .clearfix ul:first-child                { margin-left:0;}
......
47 28
.top-msg .close                                 { position:absolute; bottom:20px; right:20px; font-size:1.3em; font-weight:bold; border:0 none; color:#fff; text-decoration:none;}
48 29
.top-msg .close:hover                           { color:#000;}
49 30

  
50

  
51 31
/* container */
52 32
.container .wrapper                             { padding-bottom:100px;}
53
.container .navigation                          { margin:20px 0 40px; font-size:1.231em;}
33
.mainlogo h1									{ line-height:100%; font-size:1em; }
34
.container .navigation                          { margin:20px 0 0; font-size:1.154em; height:95px;}
54 35
.container .navigation ul                       { margin:5px 0; padding:0;}
55 36
.container .navigation ul li                    { list-style:none outside; padding:0; margin:0 0 0 1em; display:inline-block;}
56 37
.container .navigation ul li:first-child        { margin-left:0;}
57 38
.container .navigation ul li a                  { color:#000; text-decoration:none; }
58 39
.container .navigation ul li a:hover            { color:#F89A1C; }	
59 40
.container .navigation ul li.active a           { color:#F89A1C; }					
41

  
60 42
.dotted                                         { background:url(../images/double-dots.jpg) no-repeat bottom center; padding:0 0 30px; margin-bottom:30px;}
61
.two-cols .rt                                   { float:right; width:390px;}
62
.two-cols .lt                                   { float:left; width:390px;}
63
.two-cols .lt p                                 { padding-right:40px;}
64
.two-cols-lt580 .rt                             { float:right; width:200px; margin-left:40px;}
65
.two-cols-lt580 .lt                             { overflow:hidden;}
43
.two-cols .rt                                   { float:right; width:400px;}
44
.two-cols .lt                                   { float:left; width:400px;}
45
.two-cols-blog .rt                              { float:right; width:220px; margin-left:80px; padding-right:65px;}
46
.two-cols-blog .lt 	                            { overflow:hidden;}
66 47
.container h2, .container h3                    { font-weight:normal; margin-bottom:1em; }
67 48
.container h2 em 								{ color: #3582AC; font-style:normal; }
68 49
.content a						                { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#000; }
......
72 53
.container ul.options li a				        { border:0 none;}
73 54
.container ul.options li a:hover				{ text-decoration:underline;}
74 55
.landing h2, .landing a:hover                   { color:#01A1AE;}
75
.faq h2, .faq a:hover                           { color:#EF4F54; border:0 none;}
56
.faq h2, .faq a:hover, .faq .current a          { color:#EF4F54; border:0 none;}
57
.content .question h2							{ color:#4085A6 }
58
.content .question .backlink a					{ border:0 none; color:#F89A1C }
59
.content .question .backlink a:hover			{ text-decoration:underline; }
76 60
.faq h3											{ color:#4085a6; margin:0;}
77 61
.faq ul                                         { padding:0; margin:0; }
78 62
.faq ul li                                      { list-style:none outside; padding:0; margin:0;  }
......
88 72
.posts ul                                       { margin:0;padding:0; }
89 73
.posts ul li                                    { padding:0; margin:0 0 50px; list-style:none outside; }
90 74
.posts ul li img                                { max-width:580px; margin-bottom:1em;}
91
.posts ul li p.info                             { padding-bottom:10px; margin-bottom:20px; font-size:0.923em; color:#808080; border-bottom:1px dashed #000;}
92
.article p.info 								{ margin-top:20px; padding-top:10px; font-size:0.923em; color:#808080; }
75
.posts ul li p.info                             { padding-bottom:10px; margin-bottom:20px; font-size:0.769em; color:#808080; background:url(../images/dots.jpg) repeat-x bottom ;}
76
.article p.info 								{ margin-top:20px; padding-top:10px; font-size:0.769em; color:#808080; }
93 77
.article h2, .posts h2                          { color:#ef4f53; }
94 78
.posts h2 a, .posts h2 a:hover                  { border:0 none;color:#ef4f53;}
95 79
.posts p.date, .article p.date                  { margin:0; font-size:1.231em; color:#01a1ae; }
b/snf-astakos-app/astakos/im/templates/im/base.html
30 30
      <link href="https://fonts.googleapis.com/css?family=Antic" rel="stylesheet" type="text/css">
31 31
      <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/global.css">
32 32
      <!--[if lte IE 7]>
33
            <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}im/css/ie7.css">
33
            <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/ie7.css">
34 34
      <![endif]-->
35 35
  {% endblock page.css %}
36 36

  
b/snf-astakos-app/astakos/im/templates/im/login_base.html
25 25
		    {% endwith %}
26 26
		    <input type="hidden" name="next" value="{{ next }}">
27 27
		    <div class="form-row submit">
28
		    	<a class="extra-link" href="{% url django.contrib.auth.views.password_reset %}">Forgot your password?</a>
28 29
		        <input type="submit" class="submit altcol" value="SUBMIT" />
29
		        <a class="extra-link" href="{% url django.contrib.auth.views.password_reset %}">Forgot your password?</a>
30
		        
30 31
		    </div>
31 32
    	</form>
32 33
    {% endif %}
b/snf-astakos-app/astakos/im/templates/im/signup.html
6 6
{% endblock %}
7 7

  
8 8
{% block body.left %}
9
    <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/signup_pic.png" />
9
    <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/ring_bell_beige.gif" />
10 10
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
11 11
{% endblock body.left %}
12 12

  
b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf~
1
# Set the expiration time of newly created auth tokens
2
# to be this many hours after their creation time.
3
#ASTAKOS_AUTH_TOKEN_DURATION = 30 * 24
4

  
5
# Authenticate via Twitter.
6
#ASTAKOS_TWITTER_KEY = ''
7
#ASTAKOS_TWITTER_SECRET = ''
8

  
9
#ASTAKOS_DEFAULT_USER_LEVEL = 4
10

  
11
#ASTAKOS_INVITATIONS_PER_LEVEL = {
12
#    0   :   100,
13
#    1   :   2,
14
#    2   :   0,
15
#    3   :   0,
16
#    4   :   0
17
#}
18

  
19
# Address to use for outgoing emails
20
#ASTAKOS_DEFAULT_FROM_EMAIL = 'GRNET Cloud <no-reply@grnet.gr>'
21
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@cloud.grnet.gr'
22
#ASTAKOS_DEFAULT_ADMIN_EMAIL = 'admin@cloud.grnet.gr'
23

  
24
# Identity Management enabled modules
25
#ASTAKOS_IM_MODULES = ['local', 'twitter', 'shibboleth']
26

  
27
# Force user profile verification
28
#ASTAKOS_FORCE_PROFILE_UPDATE = True
29

  
30
#Enable invitations
31
#ASTAKOS_INVITATIONS_ENABLED = True
32

  
33
#ASTAKOS_COOKIE_NAME = '_pithos2_a'
34
#ASTAKOS_COOKIE_DOMAIN = None
35
#ASTAKOS_COOKIE_SECURE = True
36

  
37
#ASTAKOS_IM_STATIC_URL = '/static/im/'
38

  
39
# If set to False and invitations not enabled newly created user will be 
40
# automatically accepted
41
#ASTAKOS_MODERATION_ENABLED = True
42

  
43
# Set baseurl
44
#ASTAKOS_BASEURL = 'http://pithos.dev.grnet.gr'
45

  
46
# Set service name
47
#ASTAKOS_SITENAME = 'GRNET Cloud'
48

  
49
# Set cloud services appear in the horizontal bar
50
#ASTAKOS_CLOUD_SERVICES = (
51
#        { 'url':'/', 'name':'grnet cloud', 'id':'cloud', 'icon':'home-icon.png' },
52
#        { 'url':'/okeanos.html', 'name':'~okeanos', 'id':'okeanos' },
53
#        { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' })
54
#
55

  
56
# Set recaptcha keys
57
# http://www.google.com/recaptcha/whyrecaptcha 
58
#ASTAKOS_RECAPTCHA_PUBLIC_KEY = ''
59
#ASTAKOS_RECAPTCHA_PRIVATE_KEY = ''
60
ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'clean'}
61
#ASTAKOS_RECAPTCHA_USE_SSL = True
62
#ASTAKOS_RECAPTCHA_ENABLED = True
63

  
64
# set AstakosUser fields to propagate in the billing system
65
#ASTAKOS_BILLING_FIELDS = ['is_active']
66

  
67
# Queue for billing.
68
#'rabbitmq://guest:guest@localhost:5672/astakos'
69
#QUEUE_CONNECTION = None 
70

  
71
# Set where the user should be redirected after logout
72
#ASTAKOS_LOGOUT_NEXT = ''
73

  
74
# Set user email patterns that are automatically activated
75
#ASTAKOS_RE_USER_EMAIL_PATTERNS = []
76

  
77
# Messages to display on login page header
78
# e.g. {'warning': 'This warning message will be displayed on the top of login page'}
79
#ASTAKOS_LOGIN_MESSAGES = {}
80

  
81
# messages to display as extra actions in account forms
82
# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'}
83
#ASTAKOS_PROFILE_EXTRA_LINKS = {}
84

  

Also available in: Unified diff