Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
	snf-astakos-app/astakos/im/forms.py

diff --git a/snf-astakos-app/astakos/im/api/__init__.py b/snf-astakos-app/astakos/im/api/__init__.py
index 8a761e6..ec20f3f 100644 (file)
--- a/snf-astakos-app/astakos/im/api/__init__.py
+++ b/snf-astakos-app/astakos/im/api/__init__.py
@@ -147,7 +147,7 @@ def get_services(request):
     return HttpResponse(content=data, mimetype=mimetype)
 
 @api_method()
-def get_menu(request, with_extra_links=True, with_signout=True):
+def get_menu(request, with_extra_links=False, with_signout=True):
     user = request.user
     if not isinstance(user, AstakosUser):
         cookie = unquote(request.COOKIES.get(COOKIE_NAME, ''))

diff --git a/snf-astakos-app/astakos/im/forms.py b/snf-astakos-app/astakos/im/forms.py
index 9f07c06..ea8f0c9 100644 (file)
--- a/snf-astakos-app/astakos/im/forms.py
+++ b/snf-astakos-app/astakos/im/forms.py
@@ -492,6 +492,8 @@ class ExtendedPasswordChangeForm(PasswordChangeForm):
         return user
 
 class AstakosGroupCreationForm(forms.ModelForm):
+#     issue_date = forms.DateField(widget=SelectDateWidget())
+#     expiration_date = forms.DateField(widget=SelectDateWidget())
     kind = forms.ModelChoiceField(
         queryset=GroupKind.objects.all(),
         label="",
@@ -499,6 +501,10 @@ class AstakosGroupCreationForm(forms.ModelForm):
     )
     name = forms.URLField()
     homepage = forms.URLField()
+    moderation_enabled = forms.BooleanField(
+        help_text="Check if you want to approve members participation manually",
+        required=False   
+    )
     
     class Meta:
         model = AstakosGroup
@@ -509,9 +515,8 @@ class AstakosGroupCreationForm(forms.ModelForm):
         except KeyError:
             resources = {}
         super(AstakosGroupCreationForm, self).__init__(*args, **kwargs)
-        self.fields.keyOrder = ['kind', 'name', 'homepage', 'desc',
-                                'issue_date', 'expiration_date',
-                                'estimated_participants',
+        self.fields.keyOrder = ['kind', 'name', 'desc', 'issue_date',
+                                'expiration_date', 'estimated_participants',
                                 'moderation_enabled']
         for id, r in resources.iteritems():
             self.fields['resource_%s' % id] = forms.IntegerField(

diff --git a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
index 7c9aa6c..f5db0b5 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
+++ b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
@@ -10,7 +10,7 @@ div.cloudbar                                    { background:#000; color:#fff;
 
 div.cloudbar a, 
 div.cloudbar .profile span,
-div.cloudbar li {font-family:'Didact Gothic',Verdana,sans-serif !important; letter-spacing: 1px !important}
+div.cloudbar li                                                                {font-family:'Open Sans',sans-serif !important; letter-spacing: 1px !important}
 
 .cloudbar .wrapper                              { width:auto; padding:0;}                      
 .cloudbar a                                     { color:#fff; text-decoration:none;}

diff --git a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
index 8336801..3635d2e 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
+++ b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
@@ -29,7 +29,7 @@ $(document).ready(function(){
     $("head").append(css);
     
     // load fonts
-    var font_url = 'http://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin,greek,greek-ext';
+    var font_url = 'http://fonts.googleapis.com/css?family=Open+Sans:400,600,700&subset=latin,greek-ext,greek';
     var css_font = $("<link />");
     css_font.attr({rel:'stylesheet', type:'text/css', href:font_url});
     $("head").append(css_font);

diff --git a/snf-astakos-app/astakos/im/static/im/css/formating.css b/snf-astakos-app/astakos/im/static/im/css/formating.css
index 8b80148..e49a712 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/css/formating.css
+++ b/snf-astakos-app/astakos/im/static/im/css/formating.css
@@ -29,7 +29,7 @@ a img, :link img, :visited img                                        { border:none; }
 a span                                                                                 { cursor:pointer; }\r
 abbr[title], dfn[title]                                                        { border-bottom:1px dotted; cursor:help; }\r
 address                                                                                        { font-style:italic; margin:0 0 1.5em 0; }\r
-body                                                                                   { background:white; color:#222; font-family: 'Didact Gothic', Verdana, sans-serif;  font-style:normal; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px;}\r
+body                                                                                   { background:white; color:#222; font-family: 'Open Sans', sans-serif; font-style:normal; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px;}\r
 code, kbd, pre, samp                                                   { font-family:monospace, sans-serif; }\r
 del                                                                                            { text-decoration:line-through; }\r
 dl                                                                                             { margin:1em 0; }\r

diff --git a/snf-astakos-app/astakos/im/static/im/css/forms.css b/snf-astakos-app/astakos/im/static/im/css/forms.css
index 44e7790..dc5947a 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/css/forms.css
+++ b/snf-astakos-app/astakos/im/static/im/css/forms.css
@@ -45,7 +45,7 @@ form input[type="text"]:focus label,
 form input[type="password"]:focus label        { z-index: 300;}\r
 form input.submit, \r
 form input[type="submit"],\r
-a.submit                                                                       { font-family: 'Didact Gothic', Verdana, sans-serif; font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing:1px;  background-color: #f89a1c;color: #ffffff; border: none; padding: 10px 22px;font-size: 1em; margin:15px 0 0 223px; height:43px; }\r
+a.submit                                                                       { font-family: 'Open Sans', sans-serif; font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing:1px;  background-color: #f89a1c;color: #ffffff; border: none; padding: 10px 22px;font-size: 1em; margin:15px 0 0 223px; height:43px; }\r
 form.innerlabels input.submit, \r
 form.innerlabels input[type="submit"]          {margin-left:0;}\r
 form input.submit:hover, \r
@@ -72,7 +72,7 @@ div.form-stacked                                                      { margin-bottom: 4em; }
 form.withlabels .checkbox-widget                       { margin-top:20px; }\r
 form.innerlabels .checkbox-widget +  label     { position:static; line-height:36px; color:#808080; }\r
 form.innerlabels .checkbox-widget +  label + a { border-bottom:1px solid #F89A1C; font-size: 1.1em; }\r
-form span.info                                                         { position:absolute;z-index:10; bottom:32px;  }\r
+form span.info                                                         { position:absolute;z-index:101; bottom:32px;  }\r
 form.innerlabels span.info                                     { left: 290px; }\r
 form.withlabels span.info                                      { left:485px;  }\r
 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; }\r
@@ -141,7 +141,7 @@ form+p:first-child, form legend + p                         { margin-bottom:2em; }
 .form-row .dk_open                                                             { background:transparent; box-shadow: none; }\r
 .form-row .dk_open .dk_toggle                                  { background-color:transparent; border:0 none; color:#000; box-shadow: none;}\r
 .form-row .dk_focus .dk_toggle                                 { background-color:transparent;  border:0 none; color:#000; box-shadow: none;}\r
-.1form-row .dk_options                                                 { display:block; }
+.1form-row .dk_options                                                 { display:block; }\r
 .form-row .dk_options                                                  { box-shadow:none; border-radius:0; z-index:3; margin:6px -1px 0; width:auto; left:0;}\r
 .form-row .dk_options a                                                        { font-weight:normal;color:#808080 }\r
 .form-row .dk_options_inner                                            { padding:0; margin:0; box-shadow:none; text-shadow:none;  border-radius:0; border:1px solid #8C8C8E ;}\r
@@ -155,7 +155,7 @@ form.link-like input[type="submit"]:hover           { text-decoration:underline;  }
 .projects form.withlabels .checkbox-widget             { margin-top:5px; }\r
 .projects form .with-checkbox                                  { margin:20px 0; }\r
 .projects form .with-checkbox label                            { padding-top:7px; }\r
-.projects form .with-checkbox form span.info   { bottom:24px; }\r
+.projects form .with-checkbox span.info                        { bottom:24px; }\r
 \r
 \r
 @media screen and (max-width : 630px)          { \r

diff --git a/snf-astakos-app/astakos/im/static/im/css/modules.css b/snf-astakos-app/astakos/im/static/im/css/modules.css
index e6b38a6..15eba30 100644 (file)
--- a/snf-astakos-app/astakos/im/static/im/css/modules.css
+++ b/snf-astakos-app/astakos/im/static/im/css/modules.css
@@ -22,7 +22,7 @@ img.right                                                             { margin:0 0 1em 1em; float:right;}
 \r
 \r
 /*top message*/\r
-.top-msg                                           { margin:-36px -70px 36px; background:blue; padding:100px; color:#fff; display:none; position:relative; font-size:1.538em; text-align:center;}\r
+.top-msg                                           { margin:-36px -70px 36px; background:blue; padding:50px; color:#fff; display:none; position:relative; font-size:1.538em; text-align:center;}\r
 .top-msg p                                                                             { text-align:center; }\r
 .top-msg p.title                                   { font-size:1.3em;  }\r
 .top-msg p.title span                          { border-bottom:2px dotted #fff; padding:0 0 10px 0;}\r
@@ -49,7 +49,8 @@ img.right                                                             { margin:0 0 1em 1em; float:right;}
 .two-cols .lt                                   { float:left; width:400px;}\r
 .two-cols-blog .rt                              { float:right; width:220px; margin-left:80px; padding-right:65px;}\r
 .two-cols-blog .lt                                 { overflow:hidden;}\r
-.container h2, .container h3                    { font-weight:normal; margin-bottom:1em; }\r
+.container h2                                                                  { font-weight:700; font-size:1.308em; margin-bottom:1em; }\r
+.container h3                                                  { font-weight:normal; margin-bottom:1em; }\r
 .container h2 em                                                               { color: #3582AC; font-style:normal; }\r
 /*.content a                                                           { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#000; }\r
 .content a:hover                                                   { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#F89A1C; }*/\r
@@ -70,9 +71,9 @@ img.right                                                             { margin:0 0 1em 1em; float:right;}
 .question h2                                                                   { color:#EF4F54 }\r
 .content .backlink                                                             { margin:1em 0; }\r
 .faq h3                                                                                        { color:#4085a6; margin:0;}\r
-.faq ul                                         { padding:0 0 0 1em; margin:0; }\r
-.faq ul li                                      { padding:0; margin:0 0 5px 0;  }\r
-.faq ul li a                                    { color:#222222; border:0 none;} \r
+.faq ul                                         { padding:0; margin:0; }\r
+.faq ul li                                      { padding:0; margin:0 0 8px 0; list-style:none outside none;line-height:140%;  }\r
+.faq ul li a                                    { color:#222222; border:0 none; } \r
 .faq .faq-category                                                             { margin: 0 0 1.5em;}\r
 .follow h3 a                                    { color:#4085A6;}\r
 .follow a                                                      { border:0 none;}\r
@@ -272,6 +273,7 @@ dl.alt-style dt:nth-child(2n)                                       { background:black; }
 \r
 .question .content a:hover                                             { color:#F6921E }\r
 .details .extra-menu                                                   { background: url(../images/dots.jpg) repeat-x  center top ;padding-top:20px; margin-top:20px; }\r
+.details .extra-menu h3                                                        { margin-bottom:1em; font-weight:bold;}\r
 .details .faq-category h2                                              { font-size:1em; }\r
 .question .next-prev                                                   { margin:10px 0; }\r
 .question .next                                                                        { float:right; }\r
@@ -284,5 +286,35 @@ dl.alt-style dt:nth-child(2n)                                      { background:black; }
 .widjets li div img                                                            { max-width:100%; }\r
 .widjets li .btn                                                               { text-align:center; position:absolute; bottom:0; left:0; right:0; }\r
 \r
-.table_sorting tr th                                                   { cursor:pointer; }
-.table_sorting tr th:hover                                             { text-decoration:underline }\r
+/* billing styles */\r
+.alt-style .table-div                                                  { border:1px dashed #000; }\r
+.billing table.complex tr:nth-child(2n) td             { background:transparent; }\r
+.billing table.alt-style tr.zebra td                   { background:#F2F2F2; }\r
+.billing .highlight                                                            { text-align:center; padding:10px; border:1px dashed #000; font-size:1.231em; margin:0 0 2em;}\r
+.billing .highlight em                                                 { color:#3582AC; font-style:normal; font-weight:bold; }\r
+.billing table.marginless                                              { margin-bottom:0; }\r
+.billing .sum                                                                  { background:#5A97B8; padding:5px 5px 5px 10px; color:#fff; }\r
+.billing.details .last                                                 { width:15%;}\r
+.billing.details .prelast                                              { width:10%;}\r
+.billing.list .last                                                            { width:20%; }\r
+.billing.list .prelast                                                 { width:20%; }\r
+.billing form                                                                  { margin-top:50px; }\r
+.billing .categories                                                   { margin-bottom:2em; }\r
+.billing .categories .clear                    { color: #000000; position:relative; top:-1px; line-height:100%; display:inline-block;}\r
+.billing  a, .billing  a:hover                 { border:0 none;}\r
+.billing .categories ul                            { margin:0;padding:0;}\r
+.billing .categories ul li                     { float: left; list-style:none outside;}\r
+.billing .categories .title                    { margin-bottom: 0.5em; }\r
+.billing .categories ul li a                   { color: #000000;   margin-right: 22px; text-decoration: none; }\r
+.billing .categories ul li a:hover, \r
+.billing .categories ul li a.selected          { color: #000000;}\r
+.billing .categories ul li.active a                            { text-decoration: underline }\r
+.billing .categories ul li.inactive            { opacity: 0.3; }\r
+.billing .categories ul li.active              { opacity: 1; }\r
+.billing .resource-cat-1.filter-item a,\r
+.billing .resource-cat-1.filter-item a:hover   { color:#ff6f00 }\r
+.billing .resource-cat-2.filter-item a,\r
+.billing .resource-cat-2.filter-item a:hover   { color:#4085A5 }\r
+\r
+.table_sorting tr th                                                   { cursor:pointer; }\r
+.table_sorting tr th:hover                                             { text-decoration:underline }
\ No newline at end of file

diff --git a/snf-astakos-app/astakos/im/templates/im/base.html b/snf-astakos-app/astakos/im/templates/im/base.html
index aaf84c5..738b5b5 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/base.html
+++ b/snf-astakos-app/astakos/im/templates/im/base.html
@@ -27,7 +27,7 @@
 
   {% block page.css %}
        
-      <link href='http://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin' rel='stylesheet' type='text/css'>
+      <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,700&subset=latin,greek-ext,greek' rel='stylesheet' type='text/css'>
       <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/global.css">
       <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/print.css" media="print">
       <!--[if lte IE 7]>

diff --git a/snf-astakos-app/astakos/im/templates/im/footer.html b/snf-astakos-app/astakos/im/templates/im/footer.html
index 0169929..b75c032 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/footer.html
+++ b/snf-astakos-app/astakos/im/templates/im/footer.html
@@ -1,6 +1,6 @@
 {% block footer_content %}
  
-<p class="termslink" style="float:right"><a href="{% url latest_terms %}">Terms of use</a></p>
+<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>
  
 {% endblock %}