From cd703970b45e28635edca2efbdf5a77c77b50a49 Mon Sep 17 00:00:00 2001 From: Will Cosgrove Date: Wed, 11 Apr 2012 14:24:41 -0500 Subject: [PATCH 1/2] Added new buttons and styling --- .../images/locomotive/list/icons/toggle.png | Bin 347 -> 1340 bytes .../locomotive/list/icons/toggle_off.png | Bin 346 -> 1285 bytes .../custom_field_entry_view.js.coffee | 2 ++ .../backoffice/formtastic_changes.css.scss | 4 ++++ 4 files changed, 6 insertions(+) diff --git a/app/assets/images/locomotive/list/icons/toggle.png b/app/assets/images/locomotive/list/icons/toggle.png index 0fbbfeea3ec8c0f7dd130077270f3a4ffaadc904..130a62ce4ee92577dd23f6582dcb74ed31d622a1 100644 GIT binary patch literal 1340 zcmbVMeP|nH7{9Jvn|>~1+O3_PZ?Cl*+T`B5Bu#TPHXoNP8BL98WSRfCOYTi`ZSTX& zbxDItnzb^au#OFxOb`^LpcE1OXI9*_NTq_hKNM7?gdzjc$?yYpcD~m()j!Gv4~~1E z=bqp5@q3=`T5h|u+XLl68eae)^ogu2(O?d z5eQ5CD2gFon0oqSG(Zs588M#F6Okb{rASuZu(9SP6{87aU@))psd1!(BpMZEH+k#b z_emfMZt|of0wby)WyDZHLnDRZc&ad-atY+%qhKJQw+O*Euio_#X3t!7e{Cz+*q0<~%tPyg)m^svJFC~0iE2-a$xsDM z=3BMp^Xhw1*zxA*EWr+$F=M54a=CgbA*zL{%SHtS&e7eo<<=NtAoQ#@+)nZJ=g(w3xUs-LF1)F5(#$ zrpKOZd8eZul6wz#70eI&ehHPDLcuTRS}&=^OD+7jk@PfM_lEDXH`D(3(w@e%;#-G~ zRt?padlM&CNgWc5oVp!| zbr}c)U8q_iWCL1&SP@+%m+>Aj#sU5>|=r^(^>d5 z;0P0to_CDUydVlqVRA(J9pr68kO8oS^cslWfcP>InlD4uzC+IoH-Xp$h+A>Q%wMRS r2~;fuEG6R0&Z0;z#G0J}0t^)ZJ(fkIb(DWk00000NkvXXu0mjf#PEN3 diff --git a/app/assets/images/locomotive/list/icons/toggle_off.png b/app/assets/images/locomotive/list/icons/toggle_off.png index 11bdcd4b53e089de5bd6cbcd7aa1a9779ea42e06..749f40144b4bd8eafb83e587c9e86c6bbe23b615 100644 GIT binary patch literal 1285 zcmaJ>ZA=?w9KX`8?Z~PZ*_OEv`gkyvNPBmsrS?XlFIUzoB?P*xei5#B5A=Y0+1;@g zzDQv*784=FWXlp0&HO+Rwoe*gKB(Cek+>`-=$vj@L^HR=1kG5=5)*umQRWBhC6{~t z|NMTx|Lb$7J3EfJst;CU80JbQ*e>+N&DUwiFiURzY6%%n8}W?Mt@IgrPJ>uPP_hst zC9WTKK~5Ms{tax#Fl(Kd&KQ|gJHsoIhchvrf}|oghBdbqRE{5n2FSvGQ4SGnpMOCB zQ3w&o{3$A>#$ZlNjB2oZv?I-r4)Q^PXl((_1qKO7(BMEp8j^LU5F)m88FV(?BmuS{ z#$bqelvF0w31W%{f!{;9d8&y9O+F9pqk_I*1MpHbMbci93b<*C@dp@+2HOvTqG>`O z)5W%J$3j+!$Qg#pkYqle_v9Nriq=ok!C;W2yrkFbMhLe)A{$)6E$g*q1s3YOCaQ+0 z$iP(OvdXX#B2cD}N|4kYSy|t16KWV);8c?KP-aPGU@GqZxRobP`M>*)~{ zl3h?&hBY1yuCLY%r7|%Ma)zR%6=kU0#m<~!D0)s&L9E;Fp+Sn{McMRhF;XceDeDF& z^DxPV2&CZ=MS*Ff8~wg$Bp8T!S(=X1k+?SyjkmGUU?Us#$Gl}OtMJ1Tl#Mc1c+8Dd zB_$R$xSq&eDujk@eY`(qw=78e;i zs}E(g?;2X{`NO}wg6>v6$wtzJpRz-e1hH|S9h|?@ieomsHhr?VYie`i0A{h(SoHAN zX^RWF+v84r&AvL_u(Vw4WiqcGJ-V+Q)YSbsx47tf9_+!xRO3oI<$1_j~Hj|6I&Ga~X3|zp0p|30$zQR?mI3gb85> z9qL_<=jlH+=hNT&0vF!~(2A!0Q&= z!P_kKjrANHzz)oee;qi3BlrwSPb-MQ0~CVT;atHrvDtvE-az8~j)ZFiy}^G8L}q24 z=RHD1tmzw2r>!KGzO^7tKn*fJyh(wOBTeQ@*2}VVEF<#xdj5@$95fbo$DB3fpfX)Z zTM%-jsXTtB*D1lsnUJP+c@{!`VN1)s)3#UCV0cI`umQD&xaQi{oP{Syff~7)j{l`x qD^4R#*&bYYoI}l_IL==I1^^UZl|be}Wta{C0000# diff --git a/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee b/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee index d10a06fe..647abf87 100644 --- a/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee +++ b/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee @@ -78,8 +78,10 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View form = @$('ol') if form.is(':hidden') + @$('this').addClass('open') form.slideDown() else + @$('this').removeClass('open') form.slideUp() show_error: (message) -> diff --git a/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss b/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss index 4841dc0a..00bd24a9 100644 --- a/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss +++ b/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss @@ -157,6 +157,10 @@ form.formtastic { &:hover { background-image: image-url("locomotive/list/icons/toggle.png"); } + &.open { + @include rotate(180); + } + @include single-transition(transform, 0.5s); } &.drag { From 560afc6b0a1b5743e91d8f09c90cbc01d02be542 Mon Sep 17 00:00:00 2001 From: Will Cosgrove Date: Wed, 11 Apr 2012 15:35:23 -0500 Subject: [PATCH 2/2] Fixed my css and javascript problems --- .../views/content_types/custom_field_entry_view.js.coffee | 4 ++-- .../locomotive/backoffice/formtastic_changes.css.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee b/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee index 647abf87..07f707ad 100644 --- a/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee +++ b/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee @@ -78,10 +78,10 @@ class Locomotive.Views.ContentTypes.CustomFieldEntryView extends Backbone.View form = @$('ol') if form.is(':hidden') - @$('this').addClass('open') + @$('a.toggle').addClass('open') form.slideDown() else - @$('this').removeClass('open') + @$('a.toggle').removeClass('open') form.slideUp() show_error: (message) -> diff --git a/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss b/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss index 00bd24a9..d6137c39 100644 --- a/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss +++ b/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss @@ -158,7 +158,7 @@ form.formtastic { background-image: image-url("locomotive/list/icons/toggle.png"); } &.open { - @include rotate(180); + @include rotate(180deg); } @include single-transition(transform, 0.5s); }