From 2be26b7338e96f6c37428218e86ecc5d425086a2 Mon Sep 17 00:00:00 2001 From: Olga Brani Date: Wed, 26 Sep 2012 15:54:59 +0300 Subject: [PATCH] Group changes - Pagination set to 8 - Extra fields in sorting select - X to close widjets --- snf-astakos-app/astakos/im/forms.py | 9 +- snf-astakos-app/astakos/im/settings.py | 2 +- .../astakos/im/static/im/css/modules.css | 5 +- snf-astakos-app/astakos/im/static/im/js/common.js | 7 ++ .../im/templates/im/astakosgroup_detail.html | 2 +- .../astakos/im/templates/im/astakosgroup_list.html | 107 ++++++++++++-------- 6 files changed, 85 insertions(+), 47 deletions(-) diff --git a/snf-astakos-app/astakos/im/forms.py b/snf-astakos-app/astakos/im/forms.py index eb28578..35f9430 100644 --- a/snf-astakos-app/astakos/im/forms.py +++ b/snf-astakos-app/astakos/im/forms.py @@ -601,5 +601,12 @@ class AstakosGroupSearchForm(forms.Form): class AstakosGroupSortForm(forms.Form): sort_by = forms.ChoiceField(label='Sort by', - choices=(('groupname', 'Name'), ('kindname', 'Type')), + choices=(('groupname', 'Name'), + ('kindname', 'Type'), + ('issue_date', 'Issue Date'), + ('expiration_date', 'Expiration Date'), + ('approved_members_num', 'Participants'), + ('is_enabled', 'Status'), + ('moderation_enabled', 'Moderation') + ), required=False) \ No newline at end of file diff --git a/snf-astakos-app/astakos/im/settings.py b/snf-astakos-app/astakos/im/settings.py index 7ca7a1e..fe02e2b 100644 --- a/snf-astakos-app/astakos/im/settings.py +++ b/snf-astakos-app/astakos/im/settings.py @@ -134,4 +134,4 @@ PASSWORD_RESET_EMAIL_SUBJECT = getattr(settings, 'ASTAKOS_PASSWORD_RESET_EMAIL_S 'Password reset on %s alpha2 testing' % SITENAME) # Set how many objects should be displayed per page -PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 10) +PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 8) 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 28307b4..8add963 100644 --- a/snf-astakos-app/astakos/im/static/im/css/modules.css +++ b/snf-astakos-app/astakos/im/static/im/css/modules.css @@ -286,11 +286,14 @@ dl.alt-style dt:nth-child(2n) { background:black; } .details img { max-width:100%; } .question .section { margin-top:1em; } .question pre { border:1px dashed #000; padding:5px; margin:10px 0; line-height:auto; } -.widjets { margin: 0; padding:0; } +.widjets { position:relative; } +.widjets ul { margin: 0; padding:0; } .widjets li { width:50%; float:left; list-style:none outside; margin:30px 0; } .widjets li div { border:1px dashed #000; padding:20px 20px 70px; width:60%; margin:0 auto; position:relative; } .widjets li div img { max-width:100%; } .widjets li .btn { text-align:center; position:absolute; bottom:0; left:0; right:0; } +.widjets .widjet-x { position:absolute; right:0;top:0; font-weight:bold; font-size:1.5em; } +.widjets .widjet-x:hover { text-decoration:none; color:#000; } /* billing styles */ .alt-style .table-div { border:1px dashed #000; } diff --git a/snf-astakos-app/astakos/im/static/im/js/common.js b/snf-astakos-app/astakos/im/static/im/js/common.js index 5b2df99..7e8266e 100644 --- a/snf-astakos-app/astakos/im/static/im/js/common.js +++ b/snf-astakos-app/astakos/im/static/im/js/common.js @@ -194,6 +194,13 @@ $(document).ready(function() { $(this).hide(); }) + + $('.widjet-x').click(function(e){ + e.preventDefault(); + $(this).siblings('ul').hide('slow'); + $(this).hide(); + }) + }); $(window).resize(function() { diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html index 47f8741..f8e589f 100644 --- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html +++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html @@ -91,7 +91,7 @@
{% if object.members %} - +
diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html index 2bf0cf7..b404521 100644 --- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html +++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html @@ -4,44 +4,59 @@ {% block page.body %}
-

GROUPS

- {% if form %} -

You can search for a group by name

- {% csrf_token %} - {% include "im/form_render.html" %} -
- -
- - -
{% csrf_token %} -
- -
- - {% else %}
- +

GROUPS

+ {% if form %} +

You can search for a group by name

+ {% csrf_token %} + {% include "im/form_render.html" %} +
+ +
+ + +
{% csrf_token %} +
+ +
+ + {% else %} + +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
You can create a new group or join to an existing one.

+
+ X +
    +
  • +
    +

    WELCOME!
    Connect with a world of people who share your passions.
    With millions of groups at your fingertips, it's easy to find the group that's best for you -- no matter your interest.

    +

    CREATE

    +
    +
    • +
  • +
    +

    LOOKING FOR A GROUP?

    Well, this is the place to start!
    sdofuisd ofuaofi usdiof uiofu osifuaoi ufisdfiousf oiusd
    THINK ABOUT IT

    +

    JOIN

    +
    +
    • +
+
{% endif %} {% with page_obj.object_list as object_list %} {% if object_list %}
+
+
+ +
+
MEMBERS:
-
SEARCH RESULTS @@ -95,13 +110,12 @@