From 4bf4d4de8f2ddec561ea364127c9c6f97a345bf5 Mon Sep 17 00:00:00 2001 From: jbridson Date: Tue, 13 Mar 2012 11:12:35 +1300 Subject: [PATCH 01/23] MINOR:SSF-53 - changed color of text on link existing button on hover. --- css/GridField.css | 1 + scss/GridField.scss | 3 +++ 2 files changed, 4 insertions(+) diff --git a/css/GridField.css b/css/GridField.css index e2e67e4c9..f118ada8f 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -45,6 +45,7 @@ .cms table.ss-gridfield-table tr th.action { border-right: 0; } .cms table.ss-gridfield-table tr th.first { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; } .cms table.ss-gridfield-table tr th.last { -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; } +.cms table.ss-gridfield-table tr th button#action_gridfield_relationadd:hover { color: #444 !important; /* Not sure why IE think it needs this */ } .cms table.ss-gridfield-table tr th button:hover { color: #ccc !important; /* Not sure why IE think it needs this */ } .cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 4px 0; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } diff --git a/scss/GridField.scss b/scss/GridField.scss index d70194d88..06980d37d 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -265,6 +265,9 @@ $gf_grid_x: 16px; } button { + &#action_gridfield_relationadd:hover { + color: #444 !important; /* Not sure why IE think it needs this */ + } &:hover { color: #ccc !important; /* Not sure why IE think it needs this */ } From 4c1cb591162e4ce30530323fd140488b56e8de24 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 13 Mar 2012 16:29:34 +1300 Subject: [PATCH 02/23] MINOR: fix the bug that ModelAdmin search filter doesn't work when arriving from another section of the CMS. --- admin/javascript/ModelAdmin.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/admin/javascript/ModelAdmin.js b/admin/javascript/ModelAdmin.js index a5b8a9b37..306c584e1 100644 --- a/admin/javascript/ModelAdmin.js +++ b/admin/javascript/ModelAdmin.js @@ -4,6 +4,13 @@ (function($) { $.entwine('ss', function($){ + $('#cms-content-tools #Form_SearchForm').entwine({ + onsubmit: function(e) { + //We need to trigger handleStateChange() explicitly, otherwise handleStageChange() + //doesn't called if landing from another section of cms + this.trigger('beforeSubmit'); + } + }); /** * Class: .importSpec @@ -21,6 +28,5 @@ this._super(); } }); - }); })(jQuery); \ No newline at end of file From 1a36f92bb9e0d3965384e1fe161c1060671949c0 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Wed, 14 Mar 2012 14:43:45 +1300 Subject: [PATCH 03/23] MINOR: Fix tests on PHPUnit 3.4 --- tests/forms/gridfield/GridFieldDeleteActionTest.php | 2 +- tests/forms/gridfield/GridFieldEditButtonTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/forms/gridfield/GridFieldDeleteActionTest.php b/tests/forms/gridfield/GridFieldDeleteActionTest.php index 3c09d7b6a..b29196cd8 100644 --- a/tests/forms/gridfield/GridFieldDeleteActionTest.php +++ b/tests/forms/gridfield/GridFieldDeleteActionTest.php @@ -31,7 +31,7 @@ class GridFieldDeleteActionTest extends SapphireTest { // Check that there are content $this->assertEquals(4, count($content->getBySelector('.ss-gridfield-item'))); // Make sure that there are no delete buttons - $this->assertEmpty($content->getBySelector('.gridfield-button-delete'), 'Delete buttons should not show when not logged in.'); + $this->assertEquals(0, count($content->getBySelector('.gridfield-button-delete')), 'Delete buttons should not show when not logged in.'); } public function testShowDeleteButtonsWithAdminPermission() { diff --git a/tests/forms/gridfield/GridFieldEditButtonTest.php b/tests/forms/gridfield/GridFieldEditButtonTest.php index 13b3b045b..10cf20d94 100644 --- a/tests/forms/gridfield/GridFieldEditButtonTest.php +++ b/tests/forms/gridfield/GridFieldEditButtonTest.php @@ -32,7 +32,7 @@ class GridFieldEditButtonTest extends SapphireTest { // Check that there are content $this->assertEquals(3, count($content->getBySelector('.ss-gridfield-item'))); // Make sure that there are no edit links - $this->assertEmpty($content->getBySelector('.edit-link'), 'Edit links should not show when not logged in.'); + $this->assertEquals(0, count($content->getBySelector('.edit-link')), 'Edit links should not show when not logged in.'); } public function testShowEditLinksWithAdminPermission() { From 304b89f802fbac3bd6e7d85e87d0a484f6990dad Mon Sep 17 00:00:00 2001 From: jbridson Date: Thu, 15 Mar 2012 11:09:14 +1300 Subject: [PATCH 04/23] MINOR:replaced back button icon with correct icon. --- admin/css/screen.css | 70 +++++++++++++------------- admin/images/btn-icon-sb5d07676ff.png | Bin 17882 -> 0 bytes admin/images/btn-icon-sc495ceeeca.png | Bin 0 -> 17782 bytes admin/images/btn-icon/back.png | Bin 742 -> 779 bytes admin/scss/_style.scss | 2 +- 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 admin/images/btn-icon-sb5d07676ff.png create mode 100644 admin/images/btn-icon-sc495ceeeca.png mode change 100644 => 100755 admin/images/btn-icon/back.png diff --git a/admin/css/screen.css b/admin/css/screen.css index 4a8c71756..401c9c4c4 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -35,7 +35,7 @@ If more variables exist in the future, consider creating a variables file.*/ /** ---------------------------------------------------- Double tone borders http://daverupert.com/2011/06/two-tone-borders-with-css3/ ----------------------------------------------------- */ /** ----------------------------- Sprite images ----------------------------- */ /** Helper SCSS file for generating sprites for the interface. */ -.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-sb5d07676ff.png') no-repeat; } +.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-sc495ceeeca.png') no-repeat; } .ui-state-default .btn-icon-accept { background-position: 0 0; } .ui-state-default .btn-icon-accept_disabled { background-position: 0 -17px; } @@ -45,39 +45,39 @@ If more variables exist in the future, consider creating a variables file.*/ .ui-state-default .btn-icon-addpage_disabled { background-position: 0 -88px; } .ui-state-default .btn-icon-arrow-circle-135-left { background-position: 0 -104px; } .ui-state-default .btn-icon-back { background-position: 0 -120px; } -.ui-state-default .btn-icon-back_disabled { background-position: 0 -135px; } -.ui-state-default .btn-icon-chain--arrow { background-position: 0 -150px; } -.ui-state-default .btn-icon-chain--exclamation { background-position: 0 -166px; } -.ui-state-default .btn-icon-chain--minus { background-position: 0 -182px; } -.ui-state-default .btn-icon-chain--pencil { background-position: 0 -198px; } -.ui-state-default .btn-icon-chain--plus { background-position: 0 -214px; } -.ui-state-default .btn-icon-chain-small { background-position: 0 -230px; } -.ui-state-default .btn-icon-chain-unchain { background-position: 0 -246px; } -.ui-state-default .btn-icon-chain { background-position: 0 -262px; } -.ui-state-default .btn-icon-cross-circle { background-position: 0 -278px; } -.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -294px; } -.ui-state-default .btn-icon-decline { background-position: 0 -310px; } -.ui-state-default .btn-icon-decline_disabled { background-position: 0 -327px; } -.ui-state-default .btn-icon-download-csv { background-position: 0 -344px; } -.ui-state-default .btn-icon-drive-upload { background-position: 0 -362px; } -.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -378px; } -.ui-state-default .btn-icon-magnifier { background-position: 0 -394px; } -.ui-state-default .btn-icon-minus-circle { background-position: 0 -410px; } -.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -426px; } -.ui-state-default .btn-icon-navigation { background-position: 0 -442px; } -.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -458px; } -.ui-state-default .btn-icon-network-cloud { background-position: 0 -474px; } -.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -490px; } -.ui-state-default .btn-icon-pencil { background-position: 0 -506px; } -.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -522px; } -.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -538px; } -.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -554px; } -.ui-state-default .btn-icon-preview { background-position: 0 -570px; } -.ui-state-default .btn-icon-preview_disabled { background-position: 0 -587px; } -.ui-state-default .btn-icon-settings { background-position: 0 -604px; } -.ui-state-default .btn-icon-settings_disabled { background-position: 0 -620px; } -.ui-state-default .btn-icon-unpublish { background-position: 0 -636px; } -.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -654px; } +.ui-state-default .btn-icon-back_disabled { background-position: 0 -136px; } +.ui-state-default .btn-icon-chain--arrow { background-position: 0 -151px; } +.ui-state-default .btn-icon-chain--exclamation { background-position: 0 -167px; } +.ui-state-default .btn-icon-chain--minus { background-position: 0 -183px; } +.ui-state-default .btn-icon-chain--pencil { background-position: 0 -199px; } +.ui-state-default .btn-icon-chain--plus { background-position: 0 -215px; } +.ui-state-default .btn-icon-chain-small { background-position: 0 -231px; } +.ui-state-default .btn-icon-chain-unchain { background-position: 0 -247px; } +.ui-state-default .btn-icon-chain { background-position: 0 -263px; } +.ui-state-default .btn-icon-cross-circle { background-position: 0 -279px; } +.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -295px; } +.ui-state-default .btn-icon-decline { background-position: 0 -311px; } +.ui-state-default .btn-icon-decline_disabled { background-position: 0 -328px; } +.ui-state-default .btn-icon-download-csv { background-position: 0 -345px; } +.ui-state-default .btn-icon-drive-upload { background-position: 0 -363px; } +.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -379px; } +.ui-state-default .btn-icon-magnifier { background-position: 0 -395px; } +.ui-state-default .btn-icon-minus-circle { background-position: 0 -411px; } +.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -427px; } +.ui-state-default .btn-icon-navigation { background-position: 0 -443px; } +.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -459px; } +.ui-state-default .btn-icon-network-cloud { background-position: 0 -475px; } +.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -491px; } +.ui-state-default .btn-icon-pencil { background-position: 0 -507px; } +.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -523px; } +.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -539px; } +.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -555px; } +.ui-state-default .btn-icon-preview { background-position: 0 -571px; } +.ui-state-default .btn-icon-preview_disabled { background-position: 0 -588px; } +.ui-state-default .btn-icon-settings { background-position: 0 -605px; } +.ui-state-default .btn-icon-settings_disabled { background-position: 0 -621px; } +.ui-state-default .btn-icon-unpublish { background-position: 0 -637px; } +.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -655px; } .icon { text-indent: -9999px; border: none; outline: none; } .icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s546fcae8fd.png'); } @@ -256,7 +256,7 @@ body.cms { overflow: hidden; } .cms-content-header { padding: 0px 8px 8px; height: 32px; z-index: 60; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; } .cms-content-header a { color: #1556b2; } .cms-content-header .backlink { float: left; margin-top: 7px; } -.cms-content-header .backlink span.btn-icon-back { height: 15px; } +.cms-content-header .backlink span.btn-icon-back { height: 16px; } .cms-content-header h2 { float: left; padding: 8px 8px 0 8px; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; max-width: 400px; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; } .cms-content-header > div { width: 9999em; overflow: hidden; } .cms-content-header .cms-content-header-tabs { position: fixed; right: 40px; } diff --git a/admin/images/btn-icon-sb5d07676ff.png b/admin/images/btn-icon-sb5d07676ff.png deleted file mode 100644 index 6e9b49a31f56dcc6a3adb7fa6f803236b7427d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17882 zcmV(oLGiwcP)B8Nv!1F5TV2SR<;y?McJOg4AvfJDj*owt7Bm5#A0^9>c4mS2c z$?6ofj@hM;{L>5W^{?ONz6!>beqx-hfyfs31x_}OiE%M~q$0ensaHd7eXZefsB3Fc zfUCdr+0=81HCyn;#0EloA{*Q~S_!RZ_Kxf+Rn{qyO+}-!*Vfd4jjb(o5A7yBbLZ^L z`VDTo@%En$L^Lob!aKx4S*rkLeSISWGMNmnKX(Ft&fNx^3U@%DTY$rZ{7kC17aEAD zwcXt8-9^>-HicXcwh{@{tLj;1S)B|n_B{l7d3i9{Djq&eoexf~jv~rqS{$|3Sp-6; ztE+?L{wE=9Zx^f&83;5wxE^PK`a)tGy3=5Ah6eG(umb8j|mZ>N>^D{SK|0i!CW{Ou^%cbD&R(s1_Eu) z_GS{pi=|4XVtGu6Xw`7#aY><{&|56(l|Bq^bTs1NQg0A?;){$cI=4n~EQ-A?Nj5&buJu(fs*hFxv;0?&=Og zf$kyRYKP~2JQc=7NKCWwEXG9F@Z4%r52l6EP@m-TG;o4lT1(x7JD>Ux!@uEZM5I-# zR=z^9a5R>oCxTNet~`(M`l42?-Tmm%qk<W*n?cl%tsek}phEX&WyKVXrFx1aYg4>ymbu`i5`5(Lws>PPqN&@;5GtV~je_+frfhdi)vKO8uC5YPRRh{%Z0>({T3#z(6fh}75j z^7ip|rMFd8Re_U}6UY&q%FD~4w6qlV?Ail&?%aWh@Njr_-#%y+80boQOo*tIssJ1| zY$?OxgNLDW*UnH~Qw(gQT*6r}(gckw-HX%@1St-X>%%D8x9k4(k7A*VyIiS%oH9`w%2KZ@=Ogt!Q|7U>`DLP_fEs2gXW5#&ky(qjS>2l<5 zS5rsE3~4)e?ks6Ug#RNUA;AVScMS{->@{}m*a^YG!ELE4@M4Z*bjpq$JGSCWE?~y1 zyLRnTniOZ`$dNXPAp?dFA3kQ_z=4ww7oUWU4|c(A`CXQ%og^AM*|lw(nE39JW5EhcDwkopkf&&HI=)o$5-g(P&~45=M{Pn|lZx!b zl&y^o6kAuo;m60}`R50Z`|i8d7kMJS*h^#9-}@D$K2pd>7+@KdN``8La5*_yz~inb zLc$GE3iS2q5kq-daqz;qrluBB6nDW>>kC)=9cQ3iTU*PBVE=(@{Z1J4l}=~-L5k=u z5?27_Wkj%&g!l(&usO@+m5`B

KQ4Km_>A{HYWwSz5|Nd3ho=B2*!wMB$JuPlX=2 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 JPDHLkV1llt(Io%? diff --git a/admin/images/btn-icon-sc495ceeeca.png b/admin/images/btn-icon-sc495ceeeca.png new file mode 100644 index 0000000000000000000000000000000000000000..7f27b0297d708ca06c8cb04c3c4bd9d3fdc14d3f GIT binary patch literal 17782 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 y;C=Z{3M$bS1 Date: Fri, 16 Mar 2012 15:59:58 +1300 Subject: [PATCH 05/23] BUGFIX:fixed styling issues on edit profile dialog popup - Trac #6819 --- admin/css/screen.css | 13 +++++++++--- admin/scss/_style.scss | 45 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 401c9c4c4..4bfd52a0c 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -394,6 +394,11 @@ body.cms { overflow: hidden; } .cms-preview-header { background-color: #FFBE66; padding: 10px; font-weight: bold; } /** -------------------------------------------- Member Profile -------------------------------------------- */ +form.member-profile-form { padding: 0 16px 0 0; } +form.member-profile-form .ui-tabs-nav .ui-state-default, form.member-profile-form .ui-tabs-nav .ui-widget-content .ui-state-default, form.member-profile-form .ui-tabs-nav .ui-widget-header .ui-state-default { border-top: none; } +form.member-profile-form #Root_Permissions { clear: both; padding: 16px; } +form.member-profile-form #Root_Main { clear: both; padding: 16px; } +form.member-profile-form #FavouritePageID { margin-top: 8px; } form.member-profile-form #CsvFile .middleColumn { background: none !important; } form.member-profile-form .advanced h4 { margin-bottom: .5em; } form.member-profile-form .Actions { text-align: left; border: 0; } @@ -406,8 +411,8 @@ form.member-profile-form #Groups .middleColumn { margin-left: 0; width: 100%; } form.member-profile-form #Groups .middleColumn .TreeDropdownField { width: 90%; max-width: 90%; } form.member-profile-form #Permissions .optionset li { float: none; width: auto; } form.member-profile-form .ui-tabs-nav li { margin: 0 0 -1px 0; } -form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top, form.member-profile-form .ui-corner-right, form.member-profile-form .ui-corner-tr { border-radius: 0; } -form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top, form.member-profile-form .ui-corner-left, form.member-profile-form .ui-corner-tl { border-radius: 0; } +form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .ui-tabs-nav .ui-corner-top, form.member-profile-form .ui-tabs-nav .ui-corner-right, form.member-profile-form .ui-tabs-nav .ui-corner-tr { border-radius: 0; } +form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .ui-tabs-nav .ui-corner-top, form.member-profile-form .ui-tabs-nav .ui-corner-left, form.member-profile-form .ui-tabs-nav .ui-corner-tl { border-radius: 0; } .cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } .cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; width: 100%; } @@ -450,6 +455,8 @@ form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top .cms .ui-widget-overlay { background-color: #000; background-image: none; } +.cms .ui-dialog .ss-ui-dialog.ui-dialog-content { padding-top: 0px; } + .ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; } .ui-dialog .ui-dialog-titlebar.ui-widget-header { font-size: 14px; background-color: #92a5b2; padding: 4px 4px 4px 16px; border-bottom: 2px solid #8399a7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2NlZDdkYyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzkyYTViMiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); } .ui-dialog.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; } @@ -461,7 +468,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai .cms-dialog-content .ss-tabset { z-index: 60; -moz-border-radius: none; -webkit-border-radius: none; -o-border-radius: none; -ms-border-radius: none; -khtml-border-radius: none; border-radius: none; } .cms-dialog-content .ss-tabset .tab { background: none; overflow-y: auto; } .cms-dialog-content .ss-tabset.ui-tabs { background: none; } -.cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav { padding: 8px 0 0 0; border: none; } +.cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav { border: none; padding: 0 40px 0 0; float: right; } .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li { font-weight: bold; line-height: 16px; padding: 11px 12px 9px; border-bottom: 2px solid #B3B3B3; } .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: -1px; } .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li:first-child { margin-left: 15px; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index ba4eeef4a..219c844ab 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -822,7 +822,31 @@ body.cms { * -------------------------------------------- */ form.member-profile-form { - + padding: 0 $grid-x*2 0 0; + .ui-tabs-nav { + .ui-state-default, + .ui-widget-content .ui-state-default, + .ui-widget-header .ui-state-default { + border: { + top:none; + } + } + } + + #Root_Permissions { + clear:both; + padding: $grid-x*2; + } + + #Root_Main { + clear:both; + padding: $grid-x*2; + } + + #FavouritePageID { + margin-top:$grid-y; + } + #CsvFile .middleColumn { background: none !important; } @@ -888,13 +912,13 @@ form.member-profile-form { li { margin:0 0 -1px 0; } - } - .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-radius:0; - } + .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { + border-radius:0; + } - .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-radius:0; + .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { + border-radius:0; + } } } @@ -1092,6 +1116,10 @@ form.member-profile-form { background-image: none; } +.cms .ui-dialog .ss-ui-dialog.ui-dialog-content { + padding-top: 0px; //removes padding so that tabs are flush with header +} + // Elements with this class can either frame inline markup or an iframe, // most styles should be applied to .cms-dialog instead (which declares the content in the frame) .ui-dialog { @@ -1147,8 +1175,9 @@ body.cms-dialog { background: none; .ui-tabs-nav { - padding: $grid-x 0 0 0; border: none; + padding: 0 $grid-x*5 0 0; //allows for 40px gap to the right of tabs to match the tabs on main CMS + float: right; li { &.ui-tabs-selected { From 62ef8a269f02ff1cca7a604b0a77c10416c712a1 Mon Sep 17 00:00:00 2001 From: jbridson Date: Fri, 16 Mar 2012 16:30:35 +1300 Subject: [PATCH 06/23] ENHANCEMENT:replaced text "Toggle Formatting Help" with a ? icon on edit profile Popup - Trac #6904 --- admin/css/screen.css | 1 + admin/images/question.png | Bin 0 -> 343 bytes admin/scss/_style.scss | 6 ++++++ 3 files changed, 7 insertions(+) create mode 100755 admin/images/question.png diff --git a/admin/css/screen.css b/admin/css/screen.css index 4bfd52a0c..26939f1be 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -398,6 +398,7 @@ form.member-profile-form { padding: 0 16px 0 0; } form.member-profile-form .ui-tabs-nav .ui-state-default, form.member-profile-form .ui-tabs-nav .ui-widget-content .ui-state-default, form.member-profile-form .ui-tabs-nav .ui-widget-header .ui-state-default { border-top: none; } form.member-profile-form #Root_Permissions { clear: both; padding: 16px; } form.member-profile-form #Root_Main { clear: both; padding: 16px; } +form.member-profile-form #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; } form.member-profile-form #FavouritePageID { margin-top: 8px; } form.member-profile-form #CsvFile .middleColumn { background: none !important; } form.member-profile-form .advanced h4 { margin-bottom: .5em; } diff --git a/admin/images/question.png b/admin/images/question.png new file mode 100755 index 0000000000000000000000000000000000000000..f51f15ba3fb58340a9963069d70f353ea60a0f03 GIT binary patch literal 343 zcmV-d0jU0oP)G?Ct{ORyf6yHEDXe^#9r(g-p`~M~wUoKnM{r z&+`il3Grwi z+g3ygatp&ybaImDi7XC+0ES@z!!W@2eYp#B&IJsJmjf47RRvwwLDMu~Sr#5;%{?Qs zu)gm_)HDq|&jU&+2AF#tY>bQf>~&o$b57`mzs$C6F^b}AYycU~D$7z;INJlHxC_^H pRn^noO+2(nhgbP;f8$4h0RZ||b>{+D`I7(u002ovPDHLkV1gW@iwOV# literal 0 HcmV?d00001 diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 219c844ab..3c36205e1 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -841,6 +841,12 @@ form.member-profile-form { #Root_Main { clear:both; padding: $grid-x*2; + .cms-help-toggle { + text-indent: -9999em; + display: inline-block; + width: 20px; + background:url(../images/question.png) no-repeat 0px 0px; + } } #FavouritePageID { From 43d8c08b288384355bbd91cc8cee5e13043f580f Mon Sep 17 00:00:00 2001 From: jbridson Date: Fri, 16 Mar 2012 16:54:22 +1300 Subject: [PATCH 07/23] ENHANCEMENT:added cursor:pointer to arrows in the pages tree (Trac #6930) --- admin/css/screen.css | 4 ++-- admin/scss/_tree.scss | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 26939f1be..27adfddc4 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -613,8 +613,8 @@ form.import-form label.left { width: 250px; } .tree-holder.jstree-apple li, .cms-tree.jstree-apple li { padding: 0px; clear: left; } .tree-holder.jstree-apple ins, .cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); } .tree-holder.jstree-apple li.jstree-checked > a, .tree-holder.jstree-apple li.jstree-checked > a:link, .cms-tree.jstree-apple li.jstree-checked > a, .cms-tree.jstree-apple li.jstree-checked > a:link { background-color: #efe999; } -.tree-holder.jstree-apple .jstree-closed > ins, .cms-tree.jstree-apple .jstree-closed > ins { background-position: 0 0; } -.tree-holder.jstree-apple .jstree-open > ins, .cms-tree.jstree-apple .jstree-open > ins { background-position: -20px 0; } +.tree-holder.jstree-apple .jstree-closed > ins, .cms-tree.jstree-apple .jstree-closed > ins { background-position: 0 0; cursor: pointer; } +.tree-holder.jstree-apple .jstree-open > ins, .cms-tree.jstree-apple .jstree-open > ins { background-position: -20px 0; cursor: pointer; } a .jstree-pageicon { display: block; float: left; width: 16px; height: 16px; margin-right: 4px; background-color: transparent; background-image: url(../images/sitetree_ss_pageclass_icons_default.png); background-repeat: no-repeat; } diff --git a/admin/scss/_tree.scss b/admin/scss/_tree.scss index aa6f6cad8..59b06f838 100644 --- a/admin/scss/_tree.scss +++ b/admin/scss/_tree.scss @@ -535,11 +535,13 @@ } & .jstree-closed > ins { - background-position:0 0; + background-position:0 0; + cursor:pointer; } & .jstree-open > ins { - background-position:-20px 0; + background-position:-20px 0; + cursor:pointer; } } From 064a36e14033a62643d81e2301041d2931b22f4a Mon Sep 17 00:00:00 2001 From: jbridson Date: Fri, 16 Mar 2012 17:06:12 +1300 Subject: [PATCH 08/23] BUGFIX:fixed alignment of create and delete buttons across the CMS - Trac #6955 --- admin/css/screen.css | 2 +- admin/scss/_forms.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 27adfddc4..e3c31d0cd 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -178,7 +178,7 @@ form.small .field input.text, form.small .field textarea, form.small .field sele .cms input.loading, .cms button.loading, .cms input.ui-state-default.loading, .cms .ui-widget-content input.ui-state-default.loading, .cms .ui-widget-header input.ui-state-default.loading { color: #525252; border-color: #d5d3d3; cursor: default; } .cms input.loading .ui-icon, .cms button.loading .ui-icon, .cms input.ui-state-default.loading .ui-icon, .cms .ui-widget-content input.ui-state-default.loading .ui-icon, .cms .ui-widget-header input.ui-state-default.loading .ui-icon { background: transparent url(../../images/network-save.gif) no-repeat 0 0; } .cms input.loading.ss-ui-action-constructive .ui-icon, .cms button.loading.ss-ui-action-constructive .ui-icon { background: transparent url(../../images/network-save-constructive.gif) no-repeat 0 0; } -.cms .ss-ui-button { font-weight: bold; text-decoration: none; line-height: 16px; color: #393939; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; text-shadow: white 0 1px 1px; background-color: #e6e6e6; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -o-linear-gradient(#ffffff, #d9d9d9); background: -ms-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); /* constructive */ /* destructive */ } +.cms .ss-ui-button { margin-top: 0px; font-weight: bold; text-decoration: none; line-height: 16px; color: #393939; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; text-shadow: white 0 1px 1px; background-color: #e6e6e6; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -o-linear-gradient(#ffffff, #d9d9d9); background: -ms-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); /* constructive */ /* destructive */ } .cms .ss-ui-button.buttonset { margin: 0 -1px; } .cms .ss-ui-button.ui-state-hover, .cms .ss-ui-button:hover { text-decoration: none; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -o-linear-gradient(#ffffff, #e6e6e6); background: -ms-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -moz-box-shadow: 0 0 5px #b3b3b3; -webkit-box-shadow: 0 0 5px #b3b3b3; -o-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; } .cms .ss-ui-button:active, .cms .ss-ui-button:focus, .cms .ss-ui-button.ui-state-active, .cms .ss-ui-button.ui-state-focus { border: 1px solid #b3b3b3; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -o-linear-gradient(#ffffff, #e6e6e6); background: -ms-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -moz-box-shadow: 0 0 5px #b3b3b3 inset; -webkit-box-shadow: 0 0 5px #b3b3b3 inset; -o-box-shadow: 0 0 5px #b3b3b3 inset; box-shadow: 0 0 5px #b3b3b3 inset; } diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss index 641431145..520dd5292 100644 --- a/admin/scss/_forms.scss +++ b/admin/scss/_forms.scss @@ -275,7 +275,7 @@ form.small .field, .field.small { } .ss-ui-button { - + margin-top:0px; &.buttonset { margin: 0 -1px; // hack to avoid double borders } From 87fbb720a119aa3bee1e4e43040cd5768cb837cc Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 27 Mar 2012 16:36:00 +0200 Subject: [PATCH 09/23] MINOR Fixing 1px gap between nav tree and page header --- admin/css/screen.css | 3 +++ admin/scss/_style.scss | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/admin/css/screen.css b/admin/css/screen.css index e3c31d0cd..aa6b8ca97 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -525,6 +525,9 @@ form.import-form ul li { margin-left: 20px; } form.import-form p { margin-bottom: 5px; } form.import-form label.left { width: 250px; } +/** -------------------------------------------- Page Edit Controller -------------------------------------------- */ +.cms-container .CMSMain.CMSPageEditController { margin-left: -1px; } + /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */ .cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; } .cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; margin: 0; padding: 0; list-style-type: none; display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 3c36205e1..6e9fad080 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -1426,5 +1426,14 @@ form.import-form { label.left { width: 250px; } + } +/** -------------------------------------------- + * Page Edit Controller + * -------------------------------------------- */ + +.cms-container .CMSMain.CMSPageEditController { + // Fix pixel gap between nav tree and main page header + margin-left:-1px; +} From 6fb95e098dd7f1e54006a6f578f3e41e3708774d Mon Sep 17 00:00:00 2001 From: jbridson Date: Mon, 19 Mar 2012 10:47:27 +1300 Subject: [PATCH 10/23] BUGFIX:fixed padding issues with navigation tabs across the CMS --- admin/css/screen.css | 4 ++-- admin/scss/_style.scss | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index aa6b8ca97..b0b3a6bd0 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -260,9 +260,9 @@ body.cms { overflow: hidden; } .cms-content-header h2 { float: left; padding: 8px 8px 0 8px; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; max-width: 400px; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; } .cms-content-header > div { width: 9999em; overflow: hidden; } .cms-content-header .cms-content-header-tabs { position: fixed; right: 40px; } -.cms-content-header .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 11px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-default, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-default { border-top: none; } -.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active { border-top: none; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active { border-top: none; padding-bottom: 0px; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-right, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-tr { border-radius: 0; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-left, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 6e9fad080..00cb2d466 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -129,7 +129,7 @@ body.cms { a { font-weight: bold; line-height: $grid-y * 2; - padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3; + padding: $grid-y*1.5 $grid-x*2.5 $grid-y*1.5; } } @@ -147,6 +147,7 @@ body.cms { border: { top:none; } + padding-bottom:0px; } .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { border-radius:0; From 9e60225064d19eb20c2cf5f409aef73764fcc4bd Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Mon, 19 Mar 2012 15:27:52 +1300 Subject: [PATCH 11/23] MINOR : Update core docs to use DataList::create() rather than DataObject::get()/get_one()/get_by_id() where appropriate - Trac#6891 --- forms/OptionsetField.php | 4 ++-- model/DataList.php | 2 +- model/DataObject.php | 29 ++++++++++++++--------------- model/DataQuery.php | 2 +- model/Versioned.php | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/forms/OptionsetField.php b/forms/OptionsetField.php index 50a39f6c0..353f8201d 100644 --- a/forms/OptionsetField.php +++ b/forms/OptionsetField.php @@ -28,10 +28,10 @@ * * * //Database request for the object - * $myDoSet = DataObject::get("FooBars",""); + * $myDoSet = DataList::create("FooBars",""); * if($myDoSet){ * // This returns an array of ID => Title - * $map = $myDoSet->toDropDownMap(); + * $map = $myDoSet->map(); * * // Instantiate the OptionsetField * $FieldList = new FieldList( diff --git a/model/DataList.php b/model/DataList.php index 1984af0df..931419c25 100644 --- a/model/DataList.php +++ b/model/DataList.php @@ -658,7 +658,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * * Example: Get members from all Groups: * - * DataObject::get("Group")->relation("Members") + * DataList::Create("Group")->relation("Members") * * @param string $relationName * @return HasManyList|ManyManyList diff --git a/model/DataObject.php b/model/DataObject.php index 24c98d805..451a9905b 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -309,7 +309,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity else $passed = "The value '$record'"; user_error("DataObject::__construct passed $passed. It's supposed to be passed an array, - taken straight from the database. Perhaps you should use DataObject::get_one instead?", E_USER_WARNING); + taken straight from the database. Perhaps you should use DataList::create()->First(); instead?", E_USER_WARNING); $record = null; } @@ -2469,10 +2469,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity } /** - * @deprecated 3.0 Use DataObject::get and DataList to do your querying + * @deprecated 3.0 Use DataList::create and DataList to do your querying */ public function buildSQL($filter = "", $sort = "", $limit = "", $join = "", $restrictClasses = true, $having = "") { - Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.'); + Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.'); return $this->extendedSQL($filter, $sort, $limit, $join, $having); } @@ -2483,10 +2483,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity private static $cache_buildSQL_query; /** - * @deprecated 3.0 Use DataObject::get and DataList to do your querying + * @deprecated 3.0 Use DataList::create and DataList to do your querying */ public function extendedSQL($filter = "", $sort = "", $limit = "", $join = ""){ - Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.'); + Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.'); $dataList = DataObject::get($this->class, $filter, $sort, $join, $limit); return $dataList->dataQuery()->query(); } @@ -2521,10 +2521,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity } /** - * @deprecated 3.0 Use DataObject::get and DataList to do your querying + * @deprecated 3.0 Use DataList::create and DataList to do your querying */ public function Aggregate($class = null) { - Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.'); + Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.'); if($class) { $list = new DataList($class); @@ -2538,19 +2538,18 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity } /** - * @deprecated 3.0 Use DataObject::get and DataList to do your querying + * @deprecated 3.0 Use DataList::create and DataList to do your querying */ public function RelationshipAggregate($relationship) { - Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.'); + Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.'); return $this->$relationship(); } /** - * The internal function that actually performs the querying for get(). - * DataObject::get("Table","filter") is the same as singleton("Table")->instance_get("filter") + * DataList::create("Table")->where("filter") is the same as singleton("Table")->instance_get("filter") * - * @deprecated 3.0 Use DataObject::get and DataList to do your querying + * @deprecated 3.0 Use DataList::create and DataList to do your querying * * @param string $filter A filter to be inserted into the WHERE clause. * @param string $sort A sort expression to be inserted into the ORDER BY clause. If omitted, self::$default_sort will be used. @@ -2561,7 +2560,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * @return mixed The objects matching the filter, in the class specified by $containerClass */ public function instance_get($filter = "", $sort = "", $join = "", $limit="", $containerClass = "DataObjectSet") { - Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.'); + Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.'); return self::get($this->class, $filter, $sort, $join, $limit, $containerClass); } @@ -2693,7 +2692,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity /** * Does the hard work for get_one() * - * @deprecated 3.0 Use DataObject::get_one() instead + * @deprecated 3.0 Use DataList::create($this->class)->where($filter)->sort($orderby)->First() instead * * @uses DataExtension->augmentSQL() * @@ -2702,7 +2701,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * @return DataObject The first item matching the query */ public function instance_get_one($filter, $orderby = null) { - Deprecation::notice('3.0', 'Use DataObject::get_one() instead.'); + Deprecation::notice('3.0', 'Use DataList::create($this->class)->where($filter)->sort($orderby)->First() instead.'); return DataObject::get_one($this->class, $filter, true, $orderby); } diff --git a/model/DataQuery.php b/model/DataQuery.php index 2dad960fd..03d32c9f3 100644 --- a/model/DataQuery.php +++ b/model/DataQuery.php @@ -145,7 +145,7 @@ class DataQuery { if($this->dataClass != $baseClass) { // Get the ClassName values to filter to $classNames = ClassInfo::subclassesFor($this->dataClass); - if(!$classNames) user_error("DataObject::get() Can't find data sub-classes for '$callerClass'"); + if(!$classNames) user_error("DataList::create() Can't find data sub-classes for '$callerClass'"); $query->where[] = "\"$baseClass\".\"ClassName\" IN ('" . implode("','", $classNames) . "')"; } } diff --git a/model/Versioned.php b/model/Versioned.php index ce96c9338..fa446fafb 100644 --- a/model/Versioned.php +++ b/model/Versioned.php @@ -1006,7 +1006,7 @@ class Versioned extends DataExtension { } /** - * Return the equivalent of a DataObject::get() call, querying the latest + * Return the equivalent of a DataList::create() call, querying the latest * version of each page stored in the (class)_versions tables. * * In particular, this will query deleted records as well as active ones. From 97aa2c8ba676bba21b5dd97fd079780d714c580a Mon Sep 17 00:00:00 2001 From: jbridson Date: Tue, 27 Mar 2012 16:54:25 +0200 Subject: [PATCH 12/23] BUGFIX:adjusted padding so that content aligns properly on the add page panel Trac #6990 --- admin/css/screen.css | 3 +++ admin/scss/_style.scss | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/admin/css/screen.css b/admin/css/screen.css index b0b3a6bd0..24d69f187 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -312,6 +312,9 @@ body.cms { overflow: hidden; } /** -------------------------------------------- "Add page" dialog -------------------------------------------- */ .cms-page-add-form-dialog { display: none; } +.cms-add-form .step-label .flyout { height: 17px; padding-top: 5px; } +.cms-add-form .step-label .title { padding-top: 5px; font-weight: bold; text-shadow: 1px 1px 0 white; } +.cms-add-form ul.SelectionGroup { padding-left: 28px; } .cms-add-form .parent-mode { padding: 8px; overflow: auto; } .cms-add-form #PageType li { float: none; width: 100%; padding: 9px 0 9px 15px; overflow: hidden; border-bottom-width: 2px; border-bottom: 2px groove rgba(255, 255, 255, 0.8); -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; } .cms-add-form #PageType li:last-child { border-bottom: none; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 00cb2d466..014639d60 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -408,6 +408,20 @@ body.cms { } .cms-add-form { + .step-label { + .flyout { + height:17px; //centres number within the grey arrow + padding-top:5px; + } + .title { + padding-top:5px; //aligns label with point of arrow + font-weight:bold; //to match pagetype label + @include text-shadow(1px 1px 0 $color-text-shadow); + } + } + ul.SelectionGroup { + padding-left:28px; + } .parent-mode { padding: $grid-x; overflow: auto; From 83be1a8b43724ef662ab0a720eb81f059c3e607c Mon Sep 17 00:00:00 2001 From: jbridson Date: Mon, 19 Mar 2012 16:39:10 +1300 Subject: [PATCH 13/23] BUGFIX:removed unnecessary horizontal line from new members page and replaced cms-help-toggle text with ?icon Trac #6956 --- admin/css/screen.css | 3 +++ admin/scss/_style.scss | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/admin/css/screen.css b/admin/css/screen.css index 24d69f187..452c87f26 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -421,6 +421,9 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form . .cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } .cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; width: 100%; } .cms .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; } +.cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; } +.cms .cms-content-fields #Root_Main .customFormat { max-width: 80px; } +.cms .cms-content-fields #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; } /** -------------------------------------------- "Settings" Form -------------------------------------------- */ #CanViewType .optionset li, #CanEditType .optionset li, #CanCreateTopLevelType .optionset li { float: none; width: auto; white-space: nowrap; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 014639d60..8e6884f74 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -963,6 +963,21 @@ form.member-profile-form { margin-left:$grid-x*23; padding:$grid-x 0; } + #Root_Main { + .confirmedpassword { + border-bottom:none; + box-shadow:none; + } + .customFormat { + max-width:80px; + } + .cms-help-toggle { + text-indent: -9999em; + display: inline-block; + width: 20px; + background:url(../images/question.png) no-repeat 0px 0px; + } + } } } From 31d4629cdbb1497e9cf8590f14a5e0a38067e4fe Mon Sep 17 00:00:00 2001 From: jbridson Date: Mon, 19 Mar 2012 16:57:16 +1300 Subject: [PATCH 14/23] BUGFIX:removed the float from the li (checkboxes) in members permissions... fixed layout issues Trac #6958 --- admin/css/screen.css | 1 + admin/scss/_style.scss | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/admin/css/screen.css b/admin/css/screen.css index 452c87f26..f42ff1ba6 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -424,6 +424,7 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form . .cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; } .cms .cms-content-fields #Root_Main .customFormat { max-width: 80px; } .cms .cms-content-fields #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; } +.cms .cms-content-fields #Root_Permissions ul.optionset li { float: none; } /** -------------------------------------------- "Settings" Form -------------------------------------------- */ #CanViewType .optionset li, #CanEditType .optionset li, #CanCreateTopLevelType .optionset li { float: none; width: auto; white-space: nowrap; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 8e6884f74..41e2fff9b 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -978,6 +978,11 @@ form.member-profile-form { background:url(../images/question.png) no-repeat 0px 0px; } } + #Root_Permissions{ + ul.optionset li { + float:none; + } + } } } From 236f2673e18c122e75b7300964da5e0957c97e2d Mon Sep 17 00:00:00 2001 From: jbridson Date: Thu, 22 Mar 2012 11:05:10 +1300 Subject: [PATCH 15/23] MINOR:changed the heading 'add pages' to add page trac #7026 --- admin/templates/Includes/LeftAndMain_Menu.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/templates/Includes/LeftAndMain_Menu.ss b/admin/templates/Includes/LeftAndMain_Menu.ss index 9e5abf2f1..45b5d6cb9 100644 --- a/admin/templates/Includes/LeftAndMain_Menu.ss +++ b/admin/templates/Includes/LeftAndMain_Menu.ss @@ -58,7 +58,7 @@

From 66f537dc3aa2d7120194bbca1d5e54ff21946570 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 27 Mar 2012 12:40:19 +1300 Subject: [PATCH 16/23] BUGFIX: when apply a bugfix patch, there is one missing variable missing, add it. --- admin/thirdparty/chosen/chosen/chosen.jquery.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/thirdparty/chosen/chosen/chosen.jquery.js b/admin/thirdparty/chosen/chosen/chosen.jquery.js index bb3c1ee4e..209f72a8f 100644 --- a/admin/thirdparty/chosen/chosen/chosen.jquery.js +++ b/admin/thirdparty/chosen/chosen/chosen.jquery.js @@ -544,7 +544,8 @@ Copyright (c) 2011 by Harvest }; Chosen.prototype.results_show = function() { - var dd_top; + //patch applied: https://github.com/harvesthq/chosen/issues/300, add variable declaration dd_width + var dd_top, dd_width; if (!this.is_multiple) { this.selected_item.addClass("chzn-single-with-drop"); if (this.result_single_selected) { @@ -552,6 +553,8 @@ Copyright (c) 2011 by Harvest } } dd_top = this.is_multiple ? this.container.height() : this.container.height() - 1; + //patch applied: https://github.com/harvesthq/chosen/issues/300, add variable assignment dd_width + dd_width = this.container.width() - get_side_border_padding(this.dropdown); this.dropdown.css({ "top": dd_top + "px", "left": 0 From a95b11d004c637070a4ede8f182dbf19f1221a9c Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 27 Mar 2012 13:09:37 +1300 Subject: [PATCH 17/23] MINOR Updated chosen.js from 0.9.7 to 0.9.8 while still maintaining local fixes --- admin/thirdparty/chosen/.piston.yml | 2 +- admin/thirdparty/chosen/VERSION | 2 +- .../chosen/chosen/chosen-sprite.png | Bin 1560 -> 559 bytes admin/thirdparty/chosen/chosen/chosen.css | 7 ++-- .../thirdparty/chosen/chosen/chosen.jquery.js | 30 ++++++++++++++---- .../chosen/chosen/chosen.jquery.min.js | 5 +-- .../thirdparty/chosen/chosen/chosen.proto.js | 16 ++++++---- .../chosen/chosen/chosen.proto.min.js | 4 +-- .../chosen/coffee/chosen.jquery.coffee | 11 ++++--- .../chosen/coffee/chosen.proto.coffee | 11 ++++--- .../chosen/coffee/lib/abstract-chosen.coffee | 1 + admin/thirdparty/chosen/example.proto.html | 2 +- admin/thirdparty/chosen/package.json | 2 +- 13 files changed, 62 insertions(+), 31 deletions(-) diff --git a/admin/thirdparty/chosen/.piston.yml b/admin/thirdparty/chosen/.piston.yml index 65c32c6f1..a9041863d 100644 --- a/admin/thirdparty/chosen/.piston.yml +++ b/admin/thirdparty/chosen/.piston.yml @@ -1,7 +1,7 @@ --- format: 1 handler: - commit: 880a30dcb49555996a875cf4474999a2341aa055 + commit: f584bc49d6de7cf68475c3e51baa4cf2008a130e branch: master lock: false repository_class: Piston::Git::Repository diff --git a/admin/thirdparty/chosen/VERSION b/admin/thirdparty/chosen/VERSION index c81aa44af..e3e180701 100644 --- a/admin/thirdparty/chosen/VERSION +++ b/admin/thirdparty/chosen/VERSION @@ -1 +1 @@ -0.9.7 +0.9.8 diff --git a/admin/thirdparty/chosen/chosen/chosen-sprite.png b/admin/thirdparty/chosen/chosen/chosen-sprite.png index 231fe9055345db309f56c519b60d1bce144aa095..113dc9885a6b864ac154b266f024b4597f5c6ae7 100644 GIT binary patch delta 535 zcmV+y0_gpi46g)`BYy$*Nkl7_w9?!Y=&fGw`Tn=~{ z*Ton1uJA6{0|TOO2&BQ5HsK)1f-8_=X_7tWzO=>&TSAbor+-{Otctp_Icy10;>bvG zb;1!tn9@9~RX8G2I%CwsHHDkCy0>$esIh1ra2i{pFWqk8J}}=xVJbVkHT4^FdLL~5 zCOic$#XOK)fH9ZCJz$&fPqt9leWXN5)R3h=VcKPcDb+TN-TaAg_f?; z|FjQBh2T5*NekFy>6kDZmQ(pt$0_W6>OpmIf)Zi+=kmRcDWXlvKdpiZ23M-%ixv3?I z3Kh9IdBs*0wn|`gt$=Khu)dN4SV>8?trEmh5xxNm&iO^D3Z{Any2%D+1`1||dWOa( z=H}))3PuKo2Koj@`i4fjhUQkrMpgy}3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC;u)9L?MeOic_eEG-QUT@5WPOpPs_4cyEvER398 zEX`ngUGkGlb5rw5V0u#!dQEZa1to>t0-((?6lwduj$h}aM53zTQFZXjzlMeEn$+i%erOI&4kZ z9!mJAEy~mMj#Apy?X=YOV2k0=tEy{xepd)gjoigjVz5iSC(G`7;l9UG-!?5*jpn+3 zwZC0cx3Steu|1*dqF;wC!~A@sLzW8+d;cCkAip75Wrgs)_aE<>9-6w~ZmPk*Cdmy? z6%R!|P_5tzb5!9K^gEgPm*KPCVhi;o+i(ASl9t-4Zr_z?y|r{hQnh;Xhr7xD*Dg5p zZJlJu|NN$cG zGSAyQ&2jCuPmDhfWd4~Q$Xh7ezGZ5A+9jdwU;BXG+UpY)r6jXB{+@}@6}k7@B@0X0 z88oH&r=I;TxX&-UQvXNX2LHL8^2Wszu13i69@h^m_CDch80y)bbpKL9&BL#XE7C13 zCi!fUXWjlFsO7)y>kn@&^^X78wjz_)oF(UZl3VwO-K&
      • '); } else { - container_div.html('' + this.default_text + '
        '); + container_div.html('' + this.default_text + '
          '); } this.form_field_jq.hide().after(container_div); this.container = $('#' + this.container_id); @@ -411,7 +422,9 @@ Copyright (c) 2011 by Harvest var target_closelink; if (!this.is_disabled) { target_closelink = evt != null ? ($(evt.target)).hasClass("search-choice-close") : false; - if (evt && evt.type === "mousedown") evt.stopPropagation(); + if (evt && evt.type === "mousedown" && !this.results_showing) { + evt.stopPropagation(); + } if (!this.pending_destroy_click && !target_closelink) { if (!this.active_field) { if (this.is_multiple) this.search_field.val(""); @@ -498,7 +511,7 @@ Copyright (c) 2011 by Harvest if (data.selected && this.is_multiple) { this.choice_build(data); } else if (data.selected && !this.is_multiple) { - this.selected_item.find("span").text(data.text); + this.selected_item.removeClass("chzn-default").find("span").text(data.text); if (this.allow_single_deselect) this.single_deselect_control_build(); } } @@ -665,6 +678,7 @@ Copyright (c) 2011 by Harvest Chosen.prototype.results_reset = function(evt) { this.form_field.options[0].selected = true; this.selected_item.find("span").text(this.default_text); + if (!this.is_multiple) this.selected_item.addClass("chzn-default"); this.show_search_field_default(); $(evt.target).remove(); this.form_field_jq.trigger("change"); @@ -682,6 +696,7 @@ Copyright (c) 2011 by Harvest } else { this.search_results.find(".result-selected").removeClass("result-selected"); this.result_single_selected = high; + this.selected_item.removeClass("chzn-default"); } high.addClass("result-selected"); position = high_id.substr(high_id.lastIndexOf("_") + 1); @@ -729,11 +744,12 @@ Copyright (c) 2011 by Harvest }; Chosen.prototype.winnow_results = function() { - var found, option, part, parts, regex, result, result_id, results, searchText, startpos, text, zregex, _i, _j, _len, _len2, _ref; + var found, option, part, parts, regex, regexAnchor, result, result_id, results, searchText, startpos, text, zregex, _i, _j, _len, _len2, _ref; this.no_results_clear(); results = 0; searchText = this.search_field.val() === this.default_text ? "" : $('
          ').text($.trim(this.search_field.val())).html(); - regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); + regexAnchor = this.search_contains ? "" : "^"; + regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); _ref = this.results_data; for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/admin/thirdparty/chosen/chosen/chosen.jquery.min.js b/admin/thirdparty/chosen/chosen/chosen.jquery.min.js index 930fb9a50..9e4d23e70 100644 --- a/admin/thirdparty/chosen/chosen/chosen.jquery.min.js +++ b/admin/thirdparty/chosen/chosen/chosen.jquery.min.js @@ -1,10 +1,11 @@ // Chosen, a Select Box Enhancer for jQuery and Protoype // by Patrick Filler for Harvest, http://getharvest.com // -// Version 0.9.7 +// Version 0.9.8 // Full source at https://github.com/harvesthq/chosen // Copyright (c) 2011 Harvest http://getharvest.com // MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md // This file is generated by `cake build`, do not edit it by hand. -((function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}return a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d"+a.html+"")},a.prototype.results_update_field=function(){return this.result_clear_highlight(),this.result_single_selected=null,this.results_build()},a.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},a.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},a.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},a.prototype.generate_field_id=function(){var a;return a=this.generate_random_id(),this.form_field.id=a,a},a.prototype.generate_random_char=function(){var a,b,c;return a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length),b=a.substring(c,c+1)},a}(),b.AbstractChosen=a}.call(this),function(){var a,b,c,d,e=Object.prototype.hasOwnProperty,f=function(a,b){function d(){this.constructor=a}for(var c in b)e.call(b,c)&&(a[c]=b[c]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};d=this,a=jQuery,a.fn.extend({chosen:function(c){return!a.browser.msie||a.browser.version!=="6.0"&&a.browser.version!=="7.0"?a(this).each(function(d){if(!a(this).hasClass("chzn-done"))return new b(this,c)}):this}}),b=function(b){function e(){e.__super__.constructor.apply(this,arguments)}return f(e,b),e.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.is_rtl=this.form_field_jq.hasClass("chzn-rtl")},e.prototype.finish_setup=function(){return this.form_field_jq.addClass("chzn-done")},e.prototype.set_up_html=function(){var b,d,e,f;return this.container_id=this.form_field.id.length?this.form_field.id.replace(/(:|\.)/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),this.default_text=this.form_field_jq.data("placeholder")?this.form_field_jq.data("placeholder"):this.default_text_default,b=a("
          ",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?b.html('
            '):b.html(''+this.default_text+'
              '),this.form_field_jq.hide().after(b),this.container=a("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.find("div.chzn-drop").first(),d=this.container.height(),e=this.f_width-c(this.dropdown),this.dropdown.css({width:e+"px",top:d+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),f=e-c(this.search_container)-c(this.search_field),this.search_field.css({width:f+"px"})),this.results_build(),this.set_tab_index(),this.form_field_jq.trigger("liszt:ready",{chosen:this})},e.prototype.register_observers=function(){var a=this;return this.container.mousedown(function(b){return a.container_mousedown(b)}),this.container.mouseup(function(b){return a.container_mouseup(b)}),this.container.mouseenter(function(b){return a.mouse_enter(b)}),this.container.mouseleave(function(b){return a.mouse_leave(b)}),this.search_results.mouseup(function(b){return a.search_results_mouseup(b)}),this.search_results.mouseover(function(b){return a.search_results_mouseover(b)}),this.search_results.mouseout(function(b){return a.search_results_mouseout(b)}),this.form_field_jq.bind("liszt:updated",function(b){return a.results_update_field(b)}),this.search_field.blur(function(b){return a.input_blur(b)}),this.search_field.keyup(function(b){return a.keyup_checker(b)}),this.search_field.keydown(function(b){return a.keydown_checker(b)}),this.is_multiple?(this.search_choices.click(function(b){return a.choices_click(b)}),this.search_field.focus(function(b){return a.input_focus(b)})):this.container.click(function(a){return a.preventDefault()})},e.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled)return this.container.addClass("chzn-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus",this.activate_action),this.close_field();this.container.removeClass("chzn-disabled"),this.search_field[0].disabled=!1;if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},e.prototype.container_mousedown=function(b){var c;if(!this.is_disabled)return c=b!=null?a(b.target).hasClass("search-choice-close"):!1,b&&b.type==="mousedown"&&b.stopPropagation(),!this.pending_destroy_click&&!c?(this.active_field?!this.is_multiple&&b&&(a(b.target)[0]===this.selected_item[0]||a(b.target).parents("a.chzn-single").length)&&(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(document).click(this.click_test_action),this.results_show()),this.activate_field()):this.pending_destroy_click=!1},e.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},e.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},e.prototype.close_field=function(){return a(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},e.prototype.activate_field=function(){return!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},e.prototype.test_active_click=function(b){return a(b.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},e.prototype.results_build=function(){var a,b,c,e,f;this.parsing=!0,this.results_data=d.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||(this.selected_item.find("span").text(this.default_text),this.form_field.options.length<=this.disable_search_threshold?this.container.addClass("chzn-container-single-nosearch"):this.container.removeClass("chzn-container-single-nosearch")),a="",f=this.results_data;for(c=0,e=f.length;c'+a("
              ").text(b.label).html()+"")},e.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight();if(b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(c'+b.html+''),d=a("#"+c).find("a").first(),d.click(function(a){return e.choice_destroy_link_click(a)})},e.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),this.is_disabled?b.stopPropagation:(this.pending_destroy_click=!0,this.choice_destroy(a(b.target)))},e.prototype.choice_destroy=function(a){return this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(a.attr("rel")),a.parents("li").first().remove()},e.prototype.results_reset=function(b){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.show_search_field_default(),a(b.target).remove(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},e.prototype.result_select=function(a){var b,c,d,e;if(this.result_highlight)return b=this.result_highlight,c=b.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=b),b.addClass("result-selected"),e=c.substr(c.lastIndexOf("_")+1),d=this.results_data[e],d.selected=!0,this.form_field.options[d.options_index].selected=!0,this.is_multiple?this.choice_build(d):(this.selected_item.find("span").first().text(d.text),this.allow_single_deselect&&this.single_deselect_control_build()),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),this.form_field_jq.trigger("change"),this.search_field_scale()},e.prototype.result_activate=function(a){return a.addClass("active-result")},e.prototype.result_deactivate=function(a){return a.removeClass("active-result")},e.prototype.result_deselect=function(b){var c,d;return d=this.results_data[b],d.selected=!1,this.form_field.options[d.options_index].selected=!1,c=a("#"+this.container_id+"_o_"+b),c.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change"),this.search_field_scale()},e.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect&&this.selected_item.find("abbr").length<1)return this.selected_item.find("span").first().after('')},e.prototype.winnow_results=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r;this.no_results_clear(),i=0,j=this.search_field.val()===this.default_text?"":a("
              ").text(a.trim(this.search_field.val())).html(),f=new RegExp("^"+j.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),m=new RegExp(j.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),r=this.results_data;for(n=0,p=r.length;n=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(o=0,q=e.length;o"+c.html.substr(k+j.length),l=l.substr(0,k)+""+l.substr(k)):l=c.html,g.html(l),this.result_activate(g),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).css("display","list-item")):(this.result_highlight&&h===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(g))}}return i<1&&j.length?this.no_results(j):this.winnow_results_set_highlight()},e.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d'+this.results_none_found+' ""'),c.find("span").first().html(b),this.search_results.append(c)},e.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},e.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},e.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight)return a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices>0&&this.results_hide(),this.result_clear_highlight())},e.prototype.keydown_backstroke=function(){return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(this.pending_backstroke=this.search_container.siblings("li.search-choice").last(),this.pending_backstroke.addClass("search-choice-focus"))},e.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},e.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},e.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height(),this.dropdown.css({top:b+"px"})}},e.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},e}(AbstractChosen),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}.call(this) \ No newline at end of file +((function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}return a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d"+a.html+"")},a.prototype.results_update_field=function(){return this.result_clear_highlight(),this.result_single_selected=null,this.results_build()},a.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},a.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},a.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},a.prototype.generate_field_id=function(){var a;return a=this.generate_random_id(),this.form_field.id=a,a},a.prototype.generate_random_char=function(){var a,b,c;return a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length),b=a.substring(c,c+1)},a}(),b.AbstractChosen=a}.call(this),function(){var a,b,c,d,e=Object.prototype.hasOwnProperty,f=function(a,b){function d(){this.constructor=a}for(var c in b)e.call(b,c)&&(a[c]=b[c]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};d=this,a=jQuery,a.fn.extend({chosen:function(c){return!a.browser.msie||a.browser.version!=="6.0"&&a.browser.version!=="7.0"?a(this).each(function(d){if(!a(this).hasClass("chzn-done"))return new b(this,c)}):this}}),b=function(b){function e(){e.__super__.constructor.apply(this,arguments)}return f(e,b),e.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.is_rtl=this.form_field_jq.hasClass("chzn-rtl")},e.prototype.finish_setup=function(){return this.form_field_jq.addClass("chzn-done")},e.prototype.set_up_html=function(){var b,d,e,f;return this.container_id=this.form_field.id.length?this.form_field.id.replace(/(:|\.)/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),this.default_text=this.form_field_jq.data("placeholder")?this.form_field_jq.data("placeholder"):this.default_text_default,b=a("
              ",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?b.html('
                '):b.html(''+this.default_text+'
                  '),this.form_field_jq.hide().after(b),this.container=a("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.find("div.chzn-drop").first(),d=this.container.height(),e=this.f_width-c(this.dropdown),this.dropdown.css({width:e+"px",top:d+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),f=e-c(this.search_container)-c(this.search_field),this.search_field.css({width:f+"px"})),this.results_build(),this.set_tab_index(),this.form_field_jq.trigger("liszt:ready",{chosen:this})},e.prototype.register_observers=function(){var a=this;return this.container.mousedown(function(b){return a.container_mousedown(b)}),this.container.mouseup(function(b){return a.container_mouseup(b)}),this.container.mouseenter(function(b){return a.mouse_enter(b)}),this.container.mouseleave(function(b){return a.mouse_leave(b)}),this.search_results.mouseup(function(b){return a.search_results_mouseup(b)}),this.search_results.mouseover(function(b){return a.search_results_mouseover(b)}),this.search_results.mouseout(function(b){return a.search_results_mouseout(b)}),this.form_field_jq.bind("liszt:updated",function(b){return a.results_update_field(b)}),this.search_field.blur(function(b){return a.input_blur(b)}),this.search_field.keyup(function(b){return a.keyup_checker(b)}),this.search_field.keydown(function(b){return a.keydown_checker(b)}),this.is_multiple?(this.search_choices.click(function(b){return a.choices_click(b)}),this.search_field.focus(function(b){return a.input_focus(b)})):this.container.click(function(a){return a.preventDefault()})},e.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled)return this.container.addClass("chzn-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus",this.activate_action),this.close_field();this.container.removeClass("chzn-disabled"),this.search_field[0].disabled=!1;if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},e.prototype.container_mousedown=function(b){var c;if(!this.is_disabled)return c=b!=null?a(b.target).hasClass("search-choice-close"):!1,b&&b.type==="mousedown"&&!this.results_showing&&b.stopPropagation(),!this.pending_destroy_click&&!c?(this.active_field?!this.is_multiple&&b&&(a(b.target)[0]===this.selected_item[0]||a(b.target).parents("a.chzn-single").length)&&(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(document).click(this.click_test_action),this.results_show()),this.activate_field()):this.pending_destroy_click=!1},e.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},e.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},e.prototype.close_field=function(){return a(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},e.prototype.activate_field=function(){return!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},e.prototype.test_active_click=function(b){return a(b.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},e.prototype.results_build=function(){var a,b,c,e,f;this.parsing=!0,this.results_data=d.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||(this.selected_item.find("span").text(this.default_text),this.form_field.options.length<=this.disable_search_threshold?this.container.addClass("chzn-container-single-nosearch"):this.container.removeClass("chzn-container-single-nosearch")),a="",f=this.results_data;for(c=0,e=f.length;c'+a("
                  ").text(b.label).html()+"")},e.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight();if(b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(c'+b.html+''),d=a("#"+c).find("a").first(),d.click(function(a){return e.choice_destroy_link_click(a)})},e.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),this.is_disabled?b.stopPropagation:(this.pending_destroy_click=!0,this.choice_destroy(a(b.target)))},e.prototype.choice_destroy=function(a){return this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(a.attr("rel")),a.parents("li").first().remove()},e.prototype.results_reset=function(b){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.is_multiple||this.selected_item.addClass("chzn-default"),this.show_search_field_default(),a(b.target).remove(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},e.prototype.result_select=function(a){var b,c,d,e;if(this.result_highlight)return b=this.result_highlight,c=b.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=b,this.selected_item.removeClass("chzn-default")),b.addClass("result-selected"),e=c.substr(c.lastIndexOf("_")+1),d=this.results_data[e],d.selected=!0,this.form_field.options[d.options_index].selected=!0,this.is_multiple?this.choice_build(d):(this.selected_item.find("span").first().text(d.text),this.allow_single_deselect&&this.single_deselect_control_build()),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),this.form_field_jq.trigger("change"),this.search_field_scale()},e.prototype.result_activate=function(a){return a.addClass("active-result")},e.prototype.result_deactivate=function(a){return a.removeClass("active-result")},e.prototype.result_deselect=function(b){var c,d;return d=this.results_data[b],d.selected=!1,this.form_field.options[d.options_index].selected=!1,c=a("#"+this.container_id+"_o_"+b),c.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change"),this.search_field_scale()},e.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect&&this.selected_item.find("abbr").length<1)return this.selected_item.find("span").first().after('')},e.prototype.winnow_results=function(){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s;this.no_results_clear(),j=0,k=this.search_field.val()===this.default_text?"":a("
                  ").text(a.trim(this.search_field.val())).html(),g=this.search_contains?"":"^",f=new RegExp(g+k.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),n=new RegExp(k.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),s=this.results_data;for(o=0,q=s.length;o=0||c.html.indexOf("[")===0){e=c.html.replace(/\[|\]/g,"").split(" ");if(e.length)for(p=0,r=e.length;p"+c.html.substr(l+k.length),m=m.substr(0,l)+""+m.substr(l)):m=c.html,h.html(m),this.result_activate(h),c.group_array_index!=null&&a("#"+this.results_data[c.group_array_index].dom_id).css("display","list-item")):(this.result_highlight&&i===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(h))}}return j<1&&k.length?this.no_results(k):this.winnow_results_set_highlight()},e.prototype.winnow_results_clear=function(){var b,c,d,e,f;this.search_field.val(""),c=this.search_results.find("li"),f=[];for(d=0,e=c.length;d'+this.results_none_found+' ""'),c.find("span").first().html(b),this.search_results.append(c)},e.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},e.prototype.keydown_arrow=function(){var b,c;this.result_highlight?this.results_showing&&(c=this.result_highlight.nextAll("li.active-result").first(),c&&this.result_do_highlight(c)):(b=this.search_results.find("li.active-result").first(),b&&this.result_do_highlight(a(b)));if(!this.results_showing)return this.results_show()},e.prototype.keyup_arrow=function(){var a;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight)return a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices>0&&this.results_hide(),this.result_clear_highlight())},e.prototype.keydown_backstroke=function(){return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(this.pending_backstroke=this.search_container.siblings("li.search-choice").last(),this.pending_backstroke.addClass("search-choice-focus"))},e.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},e.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},e.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(i=0,j=g.length;i",{style:f}),c.text(this.search_field.val()),a("body").append(c),h=c.width()+25,c.remove(),h>this.f_width-10&&(h=this.f_width-10),this.search_field.css({width:h+"px"}),b=this.container.height(),this.dropdown.css({top:b+"px"})}},e.prototype.generate_random_id=function(){var b;b="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while(a("#"+b).length>0)b+=this.generate_random_char();return b},e}(AbstractChosen),c=function(a){var b;return b=a.outerWidth()-a.width()},d.get_side_border_padding=c}.call(this) + diff --git a/admin/thirdparty/chosen/chosen/chosen.proto.js b/admin/thirdparty/chosen/chosen/chosen.proto.js index e141a6924..0cbad475a 100644 --- a/admin/thirdparty/chosen/chosen/chosen.proto.js +++ b/admin/thirdparty/chosen/chosen/chosen.proto.js @@ -1,7 +1,7 @@ // Chosen, a Select Box Enhancer for jQuery and Protoype // by Patrick Filler for Harvest, http://getharvest.com // -// Version 0.9.7 +// Version 0.9.8 // Full source at https://github.com/harvesthq/chosen // Copyright (c) 2011 Harvest http://getharvest.com @@ -129,6 +129,7 @@ Copyright (c) 2011 by Harvest this.result_single_selected = null; this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false; this.disable_search_threshold = this.options.disable_search_threshold || 0; + this.search_contains = this.options.search_contains || false; this.choices = 0; return this.results_none_found = this.options.no_results_text || "No results match"; }; @@ -281,7 +282,7 @@ Copyright (c) 2011 by Harvest Chosen.prototype.set_default_values = function() { Chosen.__super__.set_default_values.call(this); - this.single_temp = new Template('#{default}
                    '); + this.single_temp = new Template('#{default}
                      '); this.multi_temp = new Template('
                        '); this.choice_temp = new Template('
                      • #{choice}
                        • '); return this.no_results_temp = new Template('
                      • ' + this.results_none_found + ' "#{terms}"
                        • '); @@ -407,7 +408,7 @@ Copyright (c) 2011 by Harvest var target_closelink; if (!this.is_disabled) { target_closelink = evt != null ? evt.target.hasClassName("search-choice-close") : false; - if (evt && evt.type === "mousedown") evt.stop(); + if (evt && evt.type === "mousedown" && !this.results_showing) evt.stop(); if (!this.pending_destroy_click && !target_closelink) { if (!this.active_field) { if (this.is_multiple) this.search_field.clear(); @@ -493,7 +494,7 @@ Copyright (c) 2011 by Harvest if (data.selected && this.is_multiple) { this.choice_build(data); } else if (data.selected && !this.is_multiple) { - this.selected_item.down("span").update(data.html); + this.selected_item.removeClassName("chzn-default").down("span").update(data.html); if (this.allow_single_deselect) this.single_deselect_control_build(); } } @@ -659,6 +660,7 @@ Copyright (c) 2011 by Harvest Chosen.prototype.results_reset = function(evt) { this.form_field.options[0].selected = true; this.selected_item.down("span").update(this.default_text); + if (!this.is_multiple) this.selected_item.addClassName("chzn-default"); this.show_search_field_default(); evt.target.remove(); if (typeof Event.simulate === 'function') this.form_field.simulate("change"); @@ -674,6 +676,7 @@ Copyright (c) 2011 by Harvest this.result_deactivate(high); } else { this.search_results.descendants(".result-selected").invoke("removeClassName", "result-selected"); + this.selected_item.removeClassName("chzn-default"); this.result_single_selected = high; } high.addClassName("result-selected"); @@ -726,11 +729,12 @@ Copyright (c) 2011 by Harvest }; Chosen.prototype.winnow_results = function() { - var found, option, part, parts, regex, result_id, results, searchText, startpos, text, zregex, _i, _j, _len, _len2, _ref; + var found, option, part, parts, regex, regexAnchor, result_id, results, searchText, startpos, text, zregex, _i, _j, _len, _len2, _ref; this.no_results_clear(); results = 0; searchText = this.search_field.value === this.default_text ? "" : this.search_field.value.strip().escapeHTML(); - regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); + regexAnchor = this.search_contains ? "" : "^"; + regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i'); _ref = this.results_data; for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/admin/thirdparty/chosen/chosen/chosen.proto.min.js b/admin/thirdparty/chosen/chosen/chosen.proto.min.js index 8e80774f1..0f8257239 100644 --- a/admin/thirdparty/chosen/chosen/chosen.proto.min.js +++ b/admin/thirdparty/chosen/chosen/chosen.proto.min.js @@ -1,10 +1,10 @@ // Chosen, a Select Box Enhancer for jQuery and Protoype // by Patrick Filler for Harvest, http://getharvest.com // -// Version 0.9.7 +// Version 0.9.8 // Full source at https://github.com/harvesthq/chosen // Copyright (c) 2011 Harvest http://getharvest.com // MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md // This file is generated by `cake build`, do not edit it by hand. -((function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}return a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d"+a.html+"")},a.prototype.results_update_field=function(){return this.result_clear_highlight(),this.result_single_selected=null,this.results_build()},a.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},a.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},a.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},a.prototype.generate_field_id=function(){var a;return a=this.generate_random_id(),this.form_field.id=a,a},a.prototype.generate_random_char=function(){var a,b,c;return a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length),b=a.substring(c,c+1)},a}(),b.AbstractChosen=a}.call(this),function(){var a,b,c,d=Object.prototype.hasOwnProperty,e=function(a,b){function e(){this.constructor=a}for(var c in b)d.call(b,c)&&(a[c]=b[c]);return e.prototype=b.prototype,a.prototype=new e,a.__super__=b.prototype,a};c=this,a=function(a){function d(){d.__super__.constructor.apply(this,arguments)}return e(d,a),d.prototype.setup=function(){return this.is_rtl=this.form_field.hasClassName("chzn-rtl")},d.prototype.finish_setup=function(){return this.form_field.addClassName("chzn-done")},d.prototype.set_default_values=function(){return d.__super__.set_default_values.call(this),this.single_temp=new Template('#{default}
                          '),this.multi_temp=new Template('
                            '),this.choice_temp=new Template('
                          • #{choice}
                            • '),this.no_results_temp=new Template('
                          • '+this.results_none_found+' "#{terms}"
                            • ')},d.prototype.set_up_html=function(){var a,c,d,e,f;return this.container_id=this.form_field.identify().replace(/(:|\.)/g,"_")+"_chzn",this.f_width=this.form_field.getStyle("width")?parseInt(this.form_field.getStyle("width"),10):this.form_field.getWidth(),c={id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px"},this.default_text=this.form_field.readAttribute("data-placeholder")?this.form_field.readAttribute("data-placeholder"):this.default_text_default,a=this.is_multiple?(new Element("div",c)).update(this.multi_temp.evaluate({"default":this.default_text})):(new Element("div",c)).update(this.single_temp.evaluate({"default":this.default_text})),this.form_field.hide().insert({after:a}),this.container=$(this.container_id),this.container.addClassName("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.down("div.chzn-drop"),d=this.container.getHeight(),e=this.f_width-b(this.dropdown),this.dropdown.setStyle({width:e+"px",top:d+"px"}),this.search_field=this.container.down("input"),this.search_results=this.container.down("ul.chzn-results"),this.search_field_scale(),this.search_no_results=this.container.down("li.no-results"),this.is_multiple?(this.search_choices=this.container.down("ul.chzn-choices"),this.search_container=this.container.down("li.search-field")):(this.search_container=this.container.down("div.chzn-search"),this.selected_item=this.container.down(".chzn-single"),f=e-b(this.search_container)-b(this.search_field),this.search_field.setStyle({width:f+"px"})),this.results_build(),this.set_tab_index(),this.form_field.fire("liszt:ready",{chosen:this})},d.prototype.register_observers=function(){var a=this;return this.container.observe("mousedown",function(b){return a.container_mousedown(b)}),this.container.observe("mouseup",function(b){return a.container_mouseup(b)}),this.container.observe("mouseenter",function(b){return a.mouse_enter(b)}),this.container.observe("mouseleave",function(b){return a.mouse_leave(b)}),this.search_results.observe("mouseup",function(b){return a.search_results_mouseup(b)}),this.search_results.observe("mouseover",function(b){return a.search_results_mouseover(b)}),this.search_results.observe("mouseout",function(b){return a.search_results_mouseout(b)}),this.form_field.observe("liszt:updated",function(b){return a.results_update_field(b)}),this.search_field.observe("blur",function(b){return a.input_blur(b)}),this.search_field.observe("keyup",function(b){return a.keyup_checker(b)}),this.search_field.observe("keydown",function(b){return a.keydown_checker(b)}),this.is_multiple?(this.search_choices.observe("click",function(b){return a.choices_click(b)}),this.search_field.observe("focus",function(b){return a.input_focus(b)})):this.container.observe("click",function(a){return a.preventDefault()})},d.prototype.search_field_disabled=function(){this.is_disabled=this.form_field.disabled;if(this.is_disabled)return this.container.addClassName("chzn-disabled"),this.search_field.disabled=!0,this.is_multiple||this.selected_item.stopObserving("focus",this.activate_action),this.close_field();this.container.removeClassName("chzn-disabled"),this.search_field.disabled=!1;if(!this.is_multiple)return this.selected_item.observe("focus",this.activate_action)},d.prototype.container_mousedown=function(a){var b;if(!this.is_disabled)return b=a!=null?a.target.hasClassName("search-choice-close"):!1,a&&a.type==="mousedown"&&a.stop(),!this.pending_destroy_click&&!b?(this.active_field?!this.is_multiple&&a&&(a.target===this.selected_item||a.target.up("a.chzn-single"))&&this.results_toggle():(this.is_multiple&&this.search_field.clear(),document.observe("click",this.click_test_action),this.results_show()),this.activate_field()):this.pending_destroy_click=!1},d.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},d.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClassName("chzn-container-active"))return this.close_field()},d.prototype.close_field=function(){return document.stopObserving("click",this.click_test_action),this.is_multiple||(this.selected_item.tabIndex=this.search_field.tabIndex,this.search_field.tabIndex=-1),this.active_field=!1,this.results_hide(),this.container.removeClassName("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},d.prototype.activate_field=function(){return!this.is_multiple&&!this.active_field&&(this.search_field.tabIndex=this.selected_item.tabIndex,this.selected_item.tabIndex=-1),this.container.addClassName("chzn-container-active"),this.active_field=!0,this.search_field.value=this.search_field.value,this.search_field.focus()},d.prototype.test_active_click=function(a){return a.target.up("#"+this.container_id)?this.active_field=!0:this.close_field()},d.prototype.results_build=function(){var a,b,d,e,f;this.parsing=!0,this.results_data=c.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.select("li.search-choice").invoke("remove"),this.choices=0):this.is_multiple||(this.selected_item.down("span").update(this.default_text),this.form_field.options.length<=this.disable_search_threshold?this.container.addClassName("chzn-container-single-nosearch"):this.container.removeClassName("chzn-container-single-nosearch")),a="",f=this.results_data;for(d=0,e=f.length;d'+a.label.escapeHTML()+"")},d.prototype.result_do_highlight=function(a){var b,c,d,e,f;this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClassName("highlighted"),d=parseInt(this.search_results.getStyle("maxHeight"),10),f=this.search_results.scrollTop,e=d+f,c=this.result_highlight.positionedOffset().top,b=c+this.result_highlight.getHeight();if(b>=e)return this.search_results.scrollTop=b-d>0?b-d:0;if(c0&&this.search_field.value.length<1&&this.results_hide(),this.result_deselect(a.readAttribute("rel")),a.up("li").remove()},d.prototype.results_reset=function(a){this.form_field.options[0].selected=!0,this.selected_item.down("span").update(this.default_text),this.show_search_field_default(),a.target.remove(),typeof Event.simulate=="function"&&this.form_field.simulate("change");if(this.active_field)return this.results_hide()},d.prototype.result_select=function(a){var b,c,d;if(this.result_highlight)return b=this.result_highlight,this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.descendants(".result-selected").invoke("removeClassName","result-selected"),this.result_single_selected=b),b.addClassName("result-selected"),d=b.id.substr(b.id.lastIndexOf("_")+1),c=this.results_data[d],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.is_multiple?this.choice_build(c):(this.selected_item.down("span").update(c.html),this.allow_single_deselect&&this.single_deselect_control_build()),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.value="",typeof Event.simulate=="function"&&this.form_field.simulate("change"),this.search_field_scale()},d.prototype.result_activate=function(a){return a.addClassName("active-result")},d.prototype.result_deactivate=function(a){return a.removeClassName("active-result")},d.prototype.result_deselect=function(a){var b,c;return c=this.results_data[a],c.selected=!1,this.form_field.options[c.options_index].selected=!1,b=$(this.container_id+"_o_"+a),b.removeClassName("result-selected").addClassName("active-result").show(),this.result_clear_highlight(),this.winnow_results(),typeof Event.simulate=="function"&&this.form_field.simulate("change"),this.search_field_scale()},d.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect&&!this.selected_item.down("abbr"))return this.selected_item.down("span").insert({after:''})},d.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p;this.no_results_clear(),g=0,h=this.search_field.value===this.default_text?"":this.search_field.value.strip().escapeHTML(),e=new RegExp("^"+h.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),k=new RegExp(h.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),p=this.results_data;for(l=0,n=p.length;l=0||b.html.indexOf("[")===0){d=b.html.replace(/\[|\]/g,"").split(" ");if(d.length)for(m=0,o=d.length;m"+b.html.substr(i+h.length),j=j.substr(0,i)+""+j.substr(i)):j=b.html,$(f).innerHTML!==j&&$(f).update(j),this.result_activate($(f)),b.group_array_index!=null&&$(this.results_data[b.group_array_index].dom_id).setStyle({display:"list-item"})):($(f)===this.result_highlight&&this.result_clear_highlight(),this.result_deactivate($(f)))}}return g<1&&h.length?this.no_results(h):this.winnow_results_set_highlight()},d.prototype.winnow_results_clear=function(){var a,b,c,d,e;this.search_field.clear(),b=this.search_results.select("li"),e=[];for(c=0,d=b.length;c0&&this.results_hide(),this.result_clear_highlight())},d.prototype.keydown_backstroke=function(){return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.down("a")),this.clear_backstroke()):(this.pending_backstroke=this.search_container.siblings("li.search-choice").last(),this.pending_backstroke.addClassName("search-choice-focus"))},d.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClassName("search-choice-focus"),this.pending_backstroke=null},d.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.value.length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},d.prototype.search_field_scale=function(){var a,b,c,d,e,f,g,h,i;if(this.is_multiple){c=0,g=0,e="position:absolute; left: -1000px; top: -1000px; display:none;",f=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(h=0,i=f.length;hthis.f_width-10&&(g=this.f_width-10),this.search_field.setStyle({width:g+"px"}),a=this.container.getHeight(),this.dropdown.setStyle({top:a+"px"})}},d}(AbstractChosen),c.Chosen=a,Prototype.Browser.IE&&/MSIE (\d+\.\d+);/.test(navigator.userAgent)&&(Prototype.BrowserFeatures.Version=new Number(RegExp.$1)),b=function(a){var b,c;return b=new Element.Layout(a),c=b.get("border-left")+b.get("border-right")+b.get("padding-left")+b.get("padding-right")},c.get_side_border_padding=b}.call(this) \ No newline at end of file +((function(){var a;a=function(){function a(){this.options_index=0,this.parsed=[]}return a.prototype.add_node=function(a){return a.nodeName==="OPTGROUP"?this.add_group(a):this.add_option(a)},a.prototype.add_group=function(a){var b,c,d,e,f,g;b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:a.label,children:0,disabled:a.disabled}),f=a.childNodes,g=[];for(d=0,e=f.length;d"+a.html+"")},a.prototype.results_update_field=function(){return this.result_clear_highlight(),this.result_single_selected=null,this.results_build()},a.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},a.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},a.prototype.keyup_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale();switch(b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:a.preventDefault();if(this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},a.prototype.generate_field_id=function(){var a;return a=this.generate_random_id(),this.form_field.id=a,a},a.prototype.generate_random_char=function(){var a,b,c;return a="0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZ",c=Math.floor(Math.random()*a.length),b=a.substring(c,c+1)},a}(),b.AbstractChosen=a}.call(this),function(){var a,b,c,d=Object.prototype.hasOwnProperty,e=function(a,b){function e(){this.constructor=a}for(var c in b)d.call(b,c)&&(a[c]=b[c]);return e.prototype=b.prototype,a.prototype=new e,a.__super__=b.prototype,a};c=this,a=function(a){function d(){d.__super__.constructor.apply(this,arguments)}return e(d,a),d.prototype.setup=function(){return this.is_rtl=this.form_field.hasClassName("chzn-rtl")},d.prototype.finish_setup=function(){return this.form_field.addClassName("chzn-done")},d.prototype.set_default_values=function(){return d.__super__.set_default_values.call(this),this.single_temp=new Template('#{default}
                              '),this.multi_temp=new Template('
                                '),this.choice_temp=new Template('
                              • #{choice}
                                • '),this.no_results_temp=new Template('
                              • '+this.results_none_found+' "#{terms}"
                                • ')},d.prototype.set_up_html=function(){var a,c,d,e,f;return this.container_id=this.form_field.identify().replace(/(:|\.)/g,"_")+"_chzn",this.f_width=this.form_field.getStyle("width")?parseInt(this.form_field.getStyle("width"),10):this.form_field.getWidth(),c={id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px"},this.default_text=this.form_field.readAttribute("data-placeholder")?this.form_field.readAttribute("data-placeholder"):this.default_text_default,a=this.is_multiple?(new Element("div",c)).update(this.multi_temp.evaluate({"default":this.default_text})):(new Element("div",c)).update(this.single_temp.evaluate({"default":this.default_text})),this.form_field.hide().insert({after:a}),this.container=$(this.container_id),this.container.addClassName("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.down("div.chzn-drop"),d=this.container.getHeight(),e=this.f_width-b(this.dropdown),this.dropdown.setStyle({width:e+"px",top:d+"px"}),this.search_field=this.container.down("input"),this.search_results=this.container.down("ul.chzn-results"),this.search_field_scale(),this.search_no_results=this.container.down("li.no-results"),this.is_multiple?(this.search_choices=this.container.down("ul.chzn-choices"),this.search_container=this.container.down("li.search-field")):(this.search_container=this.container.down("div.chzn-search"),this.selected_item=this.container.down(".chzn-single"),f=e-b(this.search_container)-b(this.search_field),this.search_field.setStyle({width:f+"px"})),this.results_build(),this.set_tab_index(),this.form_field.fire("liszt:ready",{chosen:this})},d.prototype.register_observers=function(){var a=this;return this.container.observe("mousedown",function(b){return a.container_mousedown(b)}),this.container.observe("mouseup",function(b){return a.container_mouseup(b)}),this.container.observe("mouseenter",function(b){return a.mouse_enter(b)}),this.container.observe("mouseleave",function(b){return a.mouse_leave(b)}),this.search_results.observe("mouseup",function(b){return a.search_results_mouseup(b)}),this.search_results.observe("mouseover",function(b){return a.search_results_mouseover(b)}),this.search_results.observe("mouseout",function(b){return a.search_results_mouseout(b)}),this.form_field.observe("liszt:updated",function(b){return a.results_update_field(b)}),this.search_field.observe("blur",function(b){return a.input_blur(b)}),this.search_field.observe("keyup",function(b){return a.keyup_checker(b)}),this.search_field.observe("keydown",function(b){return a.keydown_checker(b)}),this.is_multiple?(this.search_choices.observe("click",function(b){return a.choices_click(b)}),this.search_field.observe("focus",function(b){return a.input_focus(b)})):this.container.observe("click",function(a){return a.preventDefault()})},d.prototype.search_field_disabled=function(){this.is_disabled=this.form_field.disabled;if(this.is_disabled)return this.container.addClassName("chzn-disabled"),this.search_field.disabled=!0,this.is_multiple||this.selected_item.stopObserving("focus",this.activate_action),this.close_field();this.container.removeClassName("chzn-disabled"),this.search_field.disabled=!1;if(!this.is_multiple)return this.selected_item.observe("focus",this.activate_action)},d.prototype.container_mousedown=function(a){var b;if(!this.is_disabled)return b=a!=null?a.target.hasClassName("search-choice-close"):!1,a&&a.type==="mousedown"&&!this.results_showing&&a.stop(),!this.pending_destroy_click&&!b?(this.active_field?!this.is_multiple&&a&&(a.target===this.selected_item||a.target.up("a.chzn-single"))&&this.results_toggle():(this.is_multiple&&this.search_field.clear(),document.observe("click",this.click_test_action),this.results_show()),this.activate_field()):this.pending_destroy_click=!1},d.prototype.container_mouseup=function(a){if(a.target.nodeName==="ABBR")return this.results_reset(a)},d.prototype.blur_test=function(a){if(!this.active_field&&this.container.hasClassName("chzn-container-active"))return this.close_field()},d.prototype.close_field=function(){return document.stopObserving("click",this.click_test_action),this.is_multiple||(this.selected_item.tabIndex=this.search_field.tabIndex,this.search_field.tabIndex=-1),this.active_field=!1,this.results_hide(),this.container.removeClassName("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},d.prototype.activate_field=function(){return!this.is_multiple&&!this.active_field&&(this.search_field.tabIndex=this.selected_item.tabIndex,this.selected_item.tabIndex=-1),this.container.addClassName("chzn-container-active"),this.active_field=!0,this.search_field.value=this.search_field.value,this.search_field.focus()},d.prototype.test_active_click=function(a){return a.target.up("#"+this.container_id)?this.active_field=!0:this.close_field()},d.prototype.results_build=function(){var a,b,d,e,f;this.parsing=!0,this.results_data=c.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.select("li.search-choice").invoke("remove"),this.choices=0):this.is_multiple||(this.selected_item.down("span").update(this.default_text),this.form_field.options.length<=this.disable_search_threshold?this.container.addClassName("chzn-container-single-nosearch"):this.container.removeClassName("chzn-container-single-nosearch")),a="",f=this.results_data;for(d=0,e=f.length;d'+a.label.escapeHTML()+"")},d.prototype.result_do_highlight=function(a){var b,c,d,e,f;this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClassName("highlighted"),d=parseInt(this.search_results.getStyle("maxHeight"),10),f=this.search_results.scrollTop,e=d+f,c=this.result_highlight.positionedOffset().top,b=c+this.result_highlight.getHeight();if(b>=e)return this.search_results.scrollTop=b-d>0?b-d:0;if(c0&&this.search_field.value.length<1&&this.results_hide(),this.result_deselect(a.readAttribute("rel")),a.up("li").remove()},d.prototype.results_reset=function(a){this.form_field.options[0].selected=!0,this.selected_item.down("span").update(this.default_text),this.is_multiple||this.selected_item.addClassName("chzn-default"),this.show_search_field_default(),a.target.remove(),typeof Event.simulate=="function"&&this.form_field.simulate("change");if(this.active_field)return this.results_hide()},d.prototype.result_select=function(a){var b,c,d;if(this.result_highlight)return b=this.result_highlight,this.result_clear_highlight(),this.is_multiple?this.result_deactivate(b):(this.search_results.descendants(".result-selected").invoke("removeClassName","result-selected"),this.selected_item.removeClassName("chzn-default"),this.result_single_selected=b),b.addClassName("result-selected"),d=b.id.substr(b.id.lastIndexOf("_")+1),c=this.results_data[d],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.is_multiple?this.choice_build(c):(this.selected_item.down("span").update(c.html),this.allow_single_deselect&&this.single_deselect_control_build()),(!a.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.value="",typeof Event.simulate=="function"&&this.form_field.simulate("change"),this.search_field_scale()},d.prototype.result_activate=function(a){return a.addClassName("active-result")},d.prototype.result_deactivate=function(a){return a.removeClassName("active-result")},d.prototype.result_deselect=function(a){var b,c;return c=this.results_data[a],c.selected=!1,this.form_field.options[c.options_index].selected=!1,b=$(this.container_id+"_o_"+a),b.removeClassName("result-selected").addClassName("active-result").show(),this.result_clear_highlight(),this.winnow_results(),typeof Event.simulate=="function"&&this.form_field.simulate("change"),this.search_field_scale()},d.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect&&!this.selected_item.down("abbr"))return this.selected_item.down("span").insert({after:''})},d.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q;this.no_results_clear(),h=0,i=this.search_field.value===this.default_text?"":this.search_field.value.strip().escapeHTML(),f=this.search_contains?"":"^",e=new RegExp(f+i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),l=new RegExp(i.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),q=this.results_data;for(m=0,o=q.length;m=0||b.html.indexOf("[")===0){d=b.html.replace(/\[|\]/g,"").split(" ");if(d.length)for(n=0,p=d.length;n"+b.html.substr(j+i.length),k=k.substr(0,j)+""+k.substr(j)):k=b.html,$(g).innerHTML!==k&&$(g).update(k),this.result_activate($(g)),b.group_array_index!=null&&$(this.results_data[b.group_array_index].dom_id).setStyle({display:"list-item"})):($(g)===this.result_highlight&&this.result_clear_highlight(),this.result_deactivate($(g)))}}return h<1&&i.length?this.no_results(i):this.winnow_results_set_highlight()},d.prototype.winnow_results_clear=function(){var a,b,c,d,e;this.search_field.clear(),b=this.search_results.select("li"),e=[];for(c=0,d=b.length;c0&&this.results_hide(),this.result_clear_highlight())},d.prototype.keydown_backstroke=function(){return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.down("a")),this.clear_backstroke()):(this.pending_backstroke=this.search_container.siblings("li.search-choice").last(),this.pending_backstroke.addClassName("search-choice-focus"))},d.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClassName("search-choice-focus"),this.pending_backstroke=null},d.prototype.keydown_checker=function(a){var b,c;b=(c=a.which)!=null?c:a.keyCode,this.search_field_scale(),b!==8&&this.pending_backstroke&&this.clear_backstroke();switch(b){case 8:this.backstroke_length=this.search_field.value.length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},d.prototype.search_field_scale=function(){var a,b,c,d,e,f,g,h,i;if(this.is_multiple){c=0,g=0,e="position:absolute; left: -1000px; top: -1000px; display:none;",f=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(h=0,i=f.length;hthis.f_width-10&&(g=this.f_width-10),this.search_field.setStyle({width:g+"px"}),a=this.container.getHeight(),this.dropdown.setStyle({top:a+"px"})}},d}(AbstractChosen),c.Chosen=a,Prototype.Browser.IE&&/MSIE (\d+\.\d+);/.test(navigator.userAgent)&&(Prototype.BrowserFeatures.Version=new Number(RegExp.$1)),b=function(a){var b,c;return b=new Element.Layout(a),c=b.get("border-left")+b.get("border-right")+b.get("padding-left")+b.get("padding-right")},c.get_side_border_padding=b}.call(this) \ No newline at end of file diff --git a/admin/thirdparty/chosen/coffee/chosen.jquery.coffee b/admin/thirdparty/chosen/coffee/chosen.jquery.coffee index d65d0354a..ae71f9e55 100644 --- a/admin/thirdparty/chosen/coffee/chosen.jquery.coffee +++ b/admin/thirdparty/chosen/coffee/chosen.jquery.coffee @@ -40,7 +40,7 @@ class Chosen extends AbstractChosen if @is_multiple container_div.html '
                                  ' else - container_div.html '' + @default_text + '
                                    ' + container_div.html '' + @default_text + '
                                      ' @form_field_jq.hide().after container_div @container = ($ '#' + @container_id) @@ -108,7 +108,7 @@ class Chosen extends AbstractChosen container_mousedown: (evt) -> if !@is_disabled target_closelink = if evt? then ($ evt.target).hasClass "search-choice-close" else false - if evt and evt.type is "mousedown" + if evt and evt.type is "mousedown" and not @results_showing evt.stopPropagation() if not @pending_destroy_click and not target_closelink if not @active_field @@ -187,7 +187,7 @@ class Chosen extends AbstractChosen if data.selected and @is_multiple this.choice_build data else if data.selected and not @is_multiple - @selected_item.find("span").text data.text + @selected_item.removeClass("chzn-default").find("span").text data.text this.single_deselect_control_build() if @allow_single_deselect this.search_field_disabled() @@ -315,6 +315,7 @@ class Chosen extends AbstractChosen results_reset: (evt) -> @form_field.options[0].selected = true @selected_item.find("span").text @default_text + @selected_item.addClass("chzn-default") if not @is_multiple this.show_search_field_default() $(evt.target).remove(); @form_field_jq.trigger "change" @@ -332,6 +333,7 @@ class Chosen extends AbstractChosen else @search_results.find(".result-selected").removeClass "result-selected" @result_single_selected = high + @selected_item.removeClass("chzn-default") high.addClass "result-selected" @@ -383,7 +385,8 @@ class Chosen extends AbstractChosen results = 0 searchText = if @search_field.val() is @default_text then "" else $('
                                      ').text($.trim(@search_field.val())).html() - regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i') + regexAnchor = if @search_contains then "" else "^" + regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i') zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i') for option in @results_data diff --git a/admin/thirdparty/chosen/coffee/chosen.proto.coffee b/admin/thirdparty/chosen/coffee/chosen.proto.coffee index 4c306a766..d63d64047 100644 --- a/admin/thirdparty/chosen/coffee/chosen.proto.coffee +++ b/admin/thirdparty/chosen/coffee/chosen.proto.coffee @@ -16,7 +16,7 @@ class Chosen extends AbstractChosen super() # HTML Templates - @single_temp = new Template('#{default}
                                        ') + @single_temp = new Template('#{default}
                                          ') @multi_temp = new Template('
                                            ') @choice_temp = new Template('
                                          • #{choice}
                                            • ') @no_results_temp = new Template('
                                          • ' + @results_none_found + ' "#{terms}"
                                            • ') @@ -101,7 +101,7 @@ class Chosen extends AbstractChosen container_mousedown: (evt) -> if !@is_disabled target_closelink = if evt? then evt.target.hasClassName "search-choice-close" else false - if evt and evt.type is "mousedown" + if evt and evt.type is "mousedown" and not @results_showing evt.stop() if not @pending_destroy_click and not target_closelink if not @active_field @@ -179,7 +179,7 @@ class Chosen extends AbstractChosen if data.selected and @is_multiple this.choice_build data else if data.selected and not @is_multiple - @selected_item.down("span").update( data.html ) + @selected_item.removeClassName("chzn-default").down("span").update( data.html ) this.single_deselect_control_build() if @allow_single_deselect this.search_field_disabled() @@ -308,6 +308,7 @@ class Chosen extends AbstractChosen results_reset: (evt) -> @form_field.options[0].selected = true @selected_item.down("span").update(@default_text) + @selected_item.addClassName("chzn-default") if not @is_multiple this.show_search_field_default() evt.target.remove() @form_field.simulate("change") if typeof Event.simulate is 'function' @@ -322,6 +323,7 @@ class Chosen extends AbstractChosen this.result_deactivate high else @search_results.descendants(".result-selected").invoke "removeClassName", "result-selected" + @selected_item.removeClassName("chzn-default") @result_single_selected = high high.addClassName("result-selected") @@ -374,7 +376,8 @@ class Chosen extends AbstractChosen results = 0 searchText = if @search_field.value is @default_text then "" else @search_field.value.strip().escapeHTML() - regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i') + regexAnchor = if @search_contains then "" else "^" + regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i') zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i') for option in @results_data diff --git a/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee b/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee index a7c1b01da..dc68b7da9 100644 --- a/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee +++ b/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee @@ -29,6 +29,7 @@ class AbstractChosen @result_single_selected = null @allow_single_deselect = if @options.allow_single_deselect? and @form_field.options[0]? and @form_field.options[0].text is "" then @options.allow_single_deselect else false @disable_search_threshold = @options.disable_search_threshold || 0 + @search_contains = @options.search_contains || false @choices = 0 @results_none_found = @options.no_results_text or "No results match" diff --git a/admin/thirdparty/chosen/example.proto.html b/admin/thirdparty/chosen/example.proto.html index 77c48c71f..d24a08bbf 100644 --- a/admin/thirdparty/chosen/example.proto.html +++ b/admin/thirdparty/chosen/example.proto.html @@ -1343,7 +1343,7 @@ orgia and The South Sandwich Islands">South Georgia and The South Sandwich Islan

                                            Using Chosen is easy as can be.

                                            1. Download the plugin and copy the chosen files to your app.
                                              2. -
                                            2. Activate the plugin by creating a new instance of Chosen: New Chosen(some_form_field);
                                              3. +
                                            3. Activate the plugin by creating a new instance of Chosen: new Chosen(some_form_field);
                                            4. Disco.
                                            diff --git a/admin/thirdparty/chosen/package.json b/admin/thirdparty/chosen/package.json index a26bb42c8..a97f4f48b 100644 --- a/admin/thirdparty/chosen/package.json +++ b/admin/thirdparty/chosen/package.json @@ -1,7 +1,7 @@ { "author": "harvest", "name": "chosen", - "version": "0.9.7", + "version": "0.9.8", "description": "Chosen is a JavaScript plugin that makes long, unwieldy select boxes much more user-friendly. It is currently available in both jQuery and Prototype flavors.", "repository": { "type": "git", From 7a27832297bb02b63930f5ace3af37488583a991 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 27 Mar 2012 17:06:58 +0200 Subject: [PATCH 18/23] BUGFIX fix the field generated by choser with 0 width in an iFrame popup --- admin/javascript/LeftAndMain.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 2fb797a6d..bb3ddeea5 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -18,6 +18,16 @@ jQuery.noConflict(); spinner.show(); }; + // apply an select element only when it is ready, ie. when it is rendered into a template + // with css applied and got a width value. + var applyChosen = function(el){ + if(el.outerWidth()){ + el.chosen().addClass("has-chzn"); + } else { + setTimeout(function() {applyChosen(el);},500); + } + }; + $(window).bind('resize', positionLoadingSpinner).trigger('resize'); // global ajax error handlers @@ -456,8 +466,8 @@ jQuery.noConflict(); // Explicitly disable default placeholder if no custom one is defined if(!this.data('placeholder')) this.data('placeholder', ' '); - // Apply chosen - this.chosen().addClass("has-chzn"); + // Apply Chosen + applyChosen(this); this._super(); } From 9a301e3990760ac76473aa71cf3a6247d4e6d9f1 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Tue, 27 Mar 2012 17:35:37 +1300 Subject: [PATCH 19/23] BUGFIX: Empty error message on renaming a page and confirming url is changed accordingly --- javascript/lang/en_US.js | 1 + 1 file changed, 1 insertion(+) diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js index efabd2c6e..3f5967af8 100644 --- a/javascript/lang/en_US.js +++ b/javascript/lang/en_US.js @@ -11,6 +11,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') { 'UNIQUEFIELD.CANNOTLEAVEEMPTY': 'This field cannot be left empty', 'RESTRICTEDTEXTFIELD.CHARCANTBEUSED': "The character '%s' cannot be used in this field", 'UPDATEURL.CONFIRM': 'Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s', + 'UPDATEURL.CONFIRMURLCHANGED':'The URL has been changed to\n"%s"', 'FILEIFRAMEFIELD.DELETEFILE': 'Delete File', 'FILEIFRAMEFIELD.UNATTACHFILE': 'Un-Attach File', 'FILEIFRAMEFIELD.DELETEIMAGE': 'Delete Image', From efc30fd39e93b3470b109bf393c7b9c737d78801 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 27 Mar 2012 15:31:04 +0200 Subject: [PATCH 20/23] MINOR Removed setRightTitle() special case (and too specific styling) from Group->getCMSFields(), implemented title attribute for chosen.js drop downs instead (to be styled with more friendly title popovers) --- admin/css/screen.css | 3 +-- admin/javascript/LeftAndMain.js | 2 ++ admin/scss/_style.scss | 9 ++------- security/Group.php | 5 ++++- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index f42ff1ba6..613a35646 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -419,8 +419,7 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form . form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .ui-tabs-nav .ui-corner-top, form.member-profile-form .ui-tabs-nav .ui-corner-left, form.member-profile-form .ui-tabs-nav .ui-corner-tl { border-radius: 0; } .cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } -.cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; width: 100%; } -.cms .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; } +.cms .cms-content-fields { overflow-y: auto; overflow-x: auto; background: none; width: 100%; } .cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; } .cms .cms-content-fields #Root_Main .customFormat { max-width: 80px; } .cms .cms-content-fields #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; } diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index bb3ddeea5..b8c77f4f0 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -23,6 +23,8 @@ jQuery.noConflict(); var applyChosen = function(el){ if(el.outerWidth()){ el.chosen().addClass("has-chzn"); + // Copy over title attribute if required + if(el.attr('title')) el.siblings('.chzn-container').attr('title', el.attr('title')); } else { setTimeout(function() {applyChosen(el);},500); } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 41e2fff9b..77c6f9a06 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -952,17 +952,12 @@ form.member-profile-form { } .cms-content-fields { - /* always show a y scroll bar as popups like TreeDropdowns - can trigger longer pages and the extra scroll bar doesn't - fire our sizing bar */ + // always show a y scroll bar as popups like TreeDropdowns + // can trigger longer pages and the extra scroll bar doesn't fire our sizing bar overflow-y: auto; overflow-x: auto; background: none; width:100%; - .aligned-right-label { - margin-left:$grid-x*23; - padding:$grid-x 0; - } #Root_Main { .confirmedpassword { border-bottom:none; diff --git a/security/Group.php b/security/Group.php index ee52b4521..b4b8fde83 100755 --- a/security/Group.php +++ b/security/Group.php @@ -85,7 +85,10 @@ class Group extends DataObject { ) ); - $parentidfield->setRightTitle('' . _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') . ''); + $parentidfield->setAttribute( + 'title', + _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') + ); // Filter permissions // TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm From 3ef3a6df99ea554342e4e41e28b24543454b83f1 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 27 Mar 2012 16:11:05 +0200 Subject: [PATCH 21/23] MINOR Shrinking GridField button column to fit, rather than hardcoding a width for it that depends on the amount and styling of buttons in the table --- admin/css/ie7.css | 1 + admin/scss/ie7.scss | 14 ++++++++++---- css/GridField.css | 5 +++-- scss/GridField.scss | 16 +++++++++++----- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/admin/css/ie7.css b/admin/css/ie7.css index aaf3eef74..555b52021 100644 --- a/admin/css/ie7.css +++ b/admin/css/ie7.css @@ -20,6 +20,7 @@ html { overflow: hidden; } .jstree li a .ui-icon { text-indent: 0px !important; } +.cms table.ss-gridfield-table tbody td { width: auto; } .cms table.ss-gridfield-table tr th.extra span input { height: 23px; } .ss-gridfield-button-filter.ss-ui-button { margin: -1px -5px; background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter: none; } diff --git a/admin/scss/ie7.scss b/admin/scss/ie7.scss index b25afb383..1f7e9b434 100644 --- a/admin/scss/ie7.scss +++ b/admin/scss/ie7.scss @@ -68,10 +68,16 @@ html { text-indent: 0px !important; } -//fix for filter and reset icons on datagrid - -.cms table.ss-gridfield-table tr th.extra span input { - height:23px; +.cms table.ss-gridfield-table { + tbody td { + // Overrule width: 100% setting to trigger "shrink fit" + // of button row, which IE7 doesn't support + width: auto; + } + tr th.extra span input { + //fix for filter and reset icons on datagrid + height:23px; + } } .ss-gridfield-button-filter.ss-ui-button { diff --git a/css/GridField.css b/css/GridField.css index f118ada8f..8d8d74f78 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -12,11 +12,12 @@ .cms table.ss-gridfield-table thead { color: #1d2224; background: transparent; } .cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; } .cms table.ss-gridfield-table tbody { background: #FFF; } +.cms table.ss-gridfield-table tbody td { width: 100%; } +.cms table.ss-gridfield-table tbody td.col-buttons { width: auto; text-align: right; white-space: nowrap; } .cms table.ss-gridfield-table tbody td button { border: none; background: none; margin: 0 0 0 2px; padding: 0; width: auto; text-shadow: none; } .cms table.ss-gridfield-table tbody td button.ui-state-hover { background: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .cms table.ss-gridfield-table tbody td button.ui-state-active { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; width: 16px; height: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; } -.cms table.ss-gridfield-table tbody td.col-buttons { white-space: nowrap; } +.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; width: 16px; height: 20px; text-indent: 9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; } .cms table.ss-gridfield-table tfoot { color: #1d2224; } .cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); } .cms table.ss-gridfield-table tr.title { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; } diff --git a/scss/GridField.scss b/scss/GridField.scss index 06980d37d..c3cea9f9e 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -98,6 +98,16 @@ $gf_grid_x: 16px; tbody { background: #FFF; td { + // Give browser some hints on which cols take priority: + // The last column (buttons) should always shrink to fit. + // Overwritten for IE7, which doesn't support this. + width: 100%; + &.col-buttons { + width: auto; + text-align: right; + white-space: nowrap; + } + button { border: none; background: none; @@ -118,13 +128,9 @@ $gf_grid_x: 16px; display:inline-block; width:$gf_grid_x; height:20px; //min height to fit the edit icon - text-indent:-9999em; + text-indent:9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; } - - &.col-buttons { - white-space: nowrap; - } } } From 6d423fe9ee741b0334bece875a58af17517c7307 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 27 Mar 2012 16:23:48 +0200 Subject: [PATCH 22/23] MINOR Moved AssetUploadField iframe margins into iframe body itself to avoid width conflicts, override default .cms overflow behaviour to ensure the iframe content as a whole stays scrollable (fixes #7003) --- css/AssetUploadField.css | 4 +++- scss/AssetUploadField.scss | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css index 75de568af..d4d9b52b5 100644 --- a/css/AssetUploadField.css +++ b/css/AssetUploadField.css @@ -6,6 +6,8 @@ /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */ #AssetUploadField { border-bottom: 0; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; } +body.cms.ss-uploadfield-edit-iframe { padding: 16px; overflow: auto; } + .ss-assetuploadfield h3 { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px; padding: 0 0 7px; clear: both; } .ss-assetuploadfield .field { border-bottom: 0; } .ss-assetuploadfield .ss-uploadfield-files { margin: 0; padding: 0; } @@ -30,7 +32,7 @@ .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel { position: absolute; top: 7px; right: 7px; } .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button { display: block; overflow: hidden; text-indent: -9999px; padding: 0; margin: 0; border: 0; width: 16px; height: 16px; cursor: pointer; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; } .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform { /* don't use display none, for it will break jQuery('iframe').contents().height() */ height: 0; overflow: hidden; clear: both; } -.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { margin: 16px; width: 100%; } +.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { width: 100%; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { float: left; margin: 19px 0 0; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-fromcomputer { position: relative; overflow: hidden; display: block; margin: 0 10px 0 0; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { float: left; font-weight: bold; font-size: 22px; padding: 0 20px; line-height: 70px; display: none; } diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss index df2f25d50..9414a01fe 100644 --- a/scss/AssetUploadField.scss +++ b/scss/AssetUploadField.scss @@ -8,6 +8,11 @@ @include box-shadow(none); } +body.cms.ss-uploadfield-edit-iframe { + padding: $grid-x*2; + overflow: auto; +} + .ss-assetuploadfield { h3 { border-bottom: 1px solid $color-shadow-light; @@ -162,7 +167,6 @@ clear: both; iframe { - margin: $grid-x*2; width: 100%; } } From 66093f71ac2825d8af9d4a56eb9d4e9ce2bc4677 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 27 Mar 2012 17:00:33 +0200 Subject: [PATCH 23/23] MINOR Fixed one-off button height inconsistencies (fixes #6980) --- admin/images/btn-icon/addpage.png | Bin 761 -> 3305 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/admin/images/btn-icon/addpage.png b/admin/images/btn-icon/addpage.png index 3dae3ddccc963d1e899dd974ad7773665c3d72fc..554433e84dc0cbc26c9c8f872ed08d953d5a6b26 100644 GIT binary patch delta 3294 zcmV<43?cLR1?d@(7k>~41^@s6AM^iV00004XF*Lt006O%3;baP000UxX+uL$Nkc;* zP;zf(X>4Tx07!|QmUmQB*%pV-y*Is3k`RiN&}(Q?0!R(LNRcioF$oY#z>okUHbhi# zL{X8Z2r?+(fTKf^u_B6v0a3B*1Q|rsac~qHmPur-8Q;8l?|;pk-yipWYoEQ(-DmH8 z*17-A~66^n2hK0_}N?;7s)t1SDYocPsy0JG)>MhO3or#f-+W< zbMh=(eD;}T4}UrHGK4%C%X7}+W$@(OC*zGd626R)U>O(Z2>7`&z9wUXbV-Il#&6`Y z8GKGQ04S2&F6MJnWNa;Ck|;8QE#r9r;7G||@X{|>%+C|c55>;RS}qbKr-&IQTvLXP zlM{>K&(BTgi^a?^4mXV>;xX8n8Ce|RasXz}{80T+4_fVX%zrn>j6-^{fEt9F93?NzI6_LaUQyS zUQ)#3EN3gL+}vDC0iSCrFX-?3pALURUwqF}zTNNTVR-YCIFfWRLtZy-W_qSX#K_L# zaQO`8pMQt=9|!(*9u^V&B)*6*lto0#rc5AAmbF{R6Nm+wLWV&2pPKj&!~Ue%xt59A z_z}>SSOTRX8bE#?04OREAPIY9E70$K3&uwS`OS;bnV6mX&w~DaSGY|6$QC4jj$=ne zGPn{^&g`1}S^_j607XCp>OdRl0~5dmw!jg%0DlkQ0|G%Phy-z9G2ns}kO4#>7ZiZC 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 O0000