From 6da417da387550ece15b87cafb2ab5ee43ecb2ee Mon Sep 17 00:00:00 2001 From: Olga Brani Date: Tue, 11 Sep 2012 13:45:46 +0300 Subject: [PATCH] UI changes - Show more/less button - Removed table sorting --- .../astakos/im/static/im/css/modules.css | 7 +++- .../im/static/im/images/plus-minus-hover.png | Bin 0 -> 1221 bytes .../astakos/im/static/im/images/plus-minus.png | Bin 0 -> 1203 bytes snf-astakos-app/astakos/im/static/im/js/common.js | 9 +---- .../im/templates/im/astakosgroup_detail.html | 2 +- .../astakos/im/templates/im/astakosgroup_list.html | 40 ++++++++++++++++---- 6 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 snf-astakos-app/astakos/im/static/im/images/plus-minus-hover.png create mode 100644 snf-astakos-app/astakos/im/static/im/images/plus-minus.png 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 7eb6db6..ac48aab 100644 --- a/snf-astakos-app/astakos/im/static/im/css/modules.css +++ b/snf-astakos-app/astakos/im/static/im/css/modules.css @@ -322,4 +322,9 @@ dl.alt-style dt:nth-child(2n) { background:black; } table.alt-style tr.tr1 td, table.alt-style tr.tmore1 td { background:#F2F2F2 } table.alt-style tr.tr2 td, -table.alt-style tr.tmore2 td { background:#fff } \ No newline at end of file +table.alt-style tr.tmore2 td { background:#fff } +table.alt-style tr td.info-td { padding:5px; } +table.alt-style tr td.info-td div { padding:15px; border:1px dashed #000 } +table.alt-style tr td a.more-info { display:block; float:left; width:17px; height:16px; background:url(../images/plus-minus.png) no-repeat 0 0; margin-right:5px; } +table.alt-style tr td a.more-info:hover { background-image:url(../images/plus-minus-hover.png); text-decoration:none;} +table.alt-style tr td a.open { background-position:-16px 0} \ No newline at end of file diff --git a/snf-astakos-app/astakos/im/static/im/images/plus-minus-hover.png b/snf-astakos-app/astakos/im/static/im/images/plus-minus-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..57d70bb71c01724aa1f83377fec2b37a6a88e9c7 GIT binary patch literal 1221 zcmV;$1UmbPP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq@ z2{$>j>VP)@000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000CaNkltG=4LkMLpnrL!+0tL!0Xd`g+&IYtmcNRsM#ixr=LhZ~mIk6s==UKJ!K6BTYZd+R-t@1hTg+UcF?| zvL#IoRa-(gyKUjJ)s4B4`+nD-w@=w&{&4f0mgA|-hx^B4r2MgSB~^Rg+_W~9oceXD zHdRrF0T?C_0z!5qi<|rFh28tUI(gtM#qq|1@84MQ)5XhsSFLPaLlA;tfbT`O2q*-; zPfz!aZC(9^ISgO|9D3`C*gNC6B2!RLAF!(N*2{a5f5l@H} zi*J8w<>K0 z`=|_4WbbbkXz5_qc$WU)sJH6Q;^dX*x=JnAe{F{Ux-06hkAo=XQz^crb z3k|K1nED_nmV~BfEB{_TGUDgP7aFW;n7MlLdIlccy9|W^0IWZ5+`6#*$;MU;8}6R3 zWC8^%3H6VImxICcl}rSs=olua&t1B;e$%{p8u%)HLFhj{o_;3IggXMJ$@Q-8U#wKR z;Q(RSs&=)?wa+6)Dfh&b*^v{)dvNiCvFQL%Gp1sgQa^J+`|!}+{dIL|a5Cs`2P2M{ zY(h+1#jqqBF6wL5uGSU2;jLM3+Bu?QgA#Qq+Jme zD>1nPWxVInP@nEFQX3Brba!28b4z)V(HVY#)yFkj#6jSe^3vUPr7gAb;J}>=N4_2G zz8s2SN*O=VsFv}*=SW{~*N)VSpY$03XRc;XWQzWN*C`=lLPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyq@ z2`exxL1oSW000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000CINklwOrrbB7<-_)t;B>Bc_{MyU)Iat-olfuH-n2Pk%@<7# zW-h=h7`Y9Yn)O7^Kezw*)Y&8FipBZKW)HVN`TdpX;D(OmCg(w{SsFRTM$AmQN9kh-Q+erzK-nZtMupe*9gjWB@jF zB(`MJW^ZT(t>Q&}1=HF^>eW%go&j`bxcXm}&3lcC%Qt*ENj<56G1l@Iw}8O^)r6Sq6SgP2G)K4FDlM=RZ_kUkO7xeojb z{GZcqdr&Cro+@#SXr%z^YmAH`uJKMiM4qa@#;#pa+3=yy? z5o4Jx>n<5Pv?9)?t@Y(R_Nlj#)RMV_CA9?m@K&^V6ZhNa5H?hOl^NV%Ka|FqD0sg( z6BzXl$+ThD?E^9QFT$1aKORLVe_^JK3+Cn&7YWvEM>6eyFFd`3pmX=_nU*GTKOBY9 ze7W#QvV~yn&IQM*aS4Cr4BWZ|7=p{=Zm{biyIz76@z4n*m77aSaxuZ`Eof;1H*^w$ zdMBnKp1~O5!nNq~vzfiSHqMp_z8-}toaZ*H*o!XLz6y{4cGFkB!=soFpqlK%Z* zS=OG6oE{D>5H`+9sQL<0zquGl7$lLoBUR*-N0)`470Mc_Y9APtMCQSs7!bwE(na>T z$@LD8T%U-$D^8^*CjX%7=8iWGP;n~PC*tm0@9@aPO#J1|8Sm?2R*TbnX#{}tDx-P# za;|rH*Z`a#iU#sU-(PWBf5Qp}jizuve}ca@fCOo3VnoF$`J(SXKNJlBJn`1pPi4pE zDE4`4s(29*6rEp?Ry9K7D*o7otL0M*E->{mzC4Yw7D+aP`u}8s$^T)M{{;$3TP;Dh RI+_3g002ovPDHLkV1mWgG7kU% literal 0 HcmV?d00001 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 2f9683b..e8a4add 100644 --- a/snf-astakos-app/astakos/im/static/im/js/common.js +++ b/snf-astakos-app/astakos/im/static/im/js/common.js @@ -208,16 +208,9 @@ $(document).ready(function() { e.preventDefault(); $(this).toggleClass('open'); $(this).parents('tr').next('tr').toggle(); - check_table_info(); + }) - function check_table_info() { - if ($('table .more-info').hasClass('open')){ - $(this).text('[- Less Info]') - } else { - $(this).text('[+ More Info]') - } - } }); $(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 73a715a..c639979 100644 --- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html +++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html @@ -49,7 +49,7 @@ {{o.realname}} ({{o.email}}) {% endif %} - {% endfor %} + {% endfor %}  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 5999839..43d76a4 100644 --- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html +++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html @@ -39,7 +39,7 @@ {% with d|lookup:'own' as mine %} {% if mine %}
- +
@@ -51,22 +51,33 @@ + {% for o in mine %} - + - + - + {% endfor %} @@ -78,7 +89,7 @@ {% with d|lookup:'other' as other %} {% if other %}
-
MY GROUPS
Status Moderated  
{{o.name|cut:"http://"|cut:"/" }}{{o.name|cut:"http://"|cut:"/" }} {{o.kind|capfirst}} {{o.issue_date|date:"d/m/Y"}} {{o.expiration_date|date:"d/m/Y"}} {{ o.approved_members|length }} {% if o.is_enabled %}Active{% else %}Pending{% endif %} {% if o.moderation_enabled%}Yes{% else %}No{% endif %}[ + More Info ] 
+
+ {% for o in other %} - - + + @@ -131,6 +143,20 @@ {% endif %} {% endif %} + + + + {% endfor %} -- 1.7.10.4
{% if is_search %} SEARCH RESULTS @@ -97,13 +108,14 @@
Enrollment status 
{{o.name|cut:"http://"|cut:"/" }}
{{o.name|cut:"http://"|cut:"/" }} {{o.kind|capfirst}} {{o.issue_date|date:"d/m/Y"}} {{o.expiration_date|date:"d/m/Y"}}