From b1f27b40cebd3ccc94f4d41ff5eecc71463c7f8f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 29 Mar 2011 21:34:26 +1300 Subject: [PATCH] MINOR Updated image references in sapphire/ folder to local files, rather than requiring cms/ folder (copied a bunch of images files over for this) --- admin/code/LeftAndMain.php | 8 ++------ admin/css/cms_right.css | 2 +- admin/css/layout.css | 6 +++--- admin/images/arrow_refresh.gif | Bin 0 -> 564 bytes admin/images/network-save.gif | Bin 1737 -> 0 bytes admin/javascript/AssetTableField.js | 2 +- admin/javascript/MemberTableField.js | 2 +- admin/templates/Includes/MemberTableField.ss | 2 +- admin/tests/LeftAndMainTest.php | 12 ++++++------ css/ComplexTableField_popup.css | 2 +- css/Form.css | 2 +- css/TableListField.css | 6 +++--- dev/install/config-form.html | 2 +- forms/ComplexTableField.php | 12 ++++++------ forms/FileIFrameField.php | 1 - forms/TableListField.php | 8 ++++---- images/bullet_arrow_down.png | Bin 0 -> 147 bytes images/bullet_arrow_up.png | Bin 0 -> 140 bytes images/checkbox.png | Bin 0 -> 148 bytes images/delete.gif | Bin 0 -> 356 bytes images/delete_disabled.gif | Bin 0 -> 230 bytes images/edit.gif | Bin 0 -> 1054 bytes images/edit_disabled.gif | Bin 0 -> 305 bytes images/pagination/record-export.png | Bin 0 -> 817 bytes images/pagination/record-first-g.png | Bin 0 -> 1127 bytes images/pagination/record-first.png | Bin 0 -> 1142 bytes images/pagination/record-last-g.png | Bin 0 -> 1095 bytes images/pagination/record-last.png | Bin 0 -> 1111 bytes images/pagination/record-next-g.png | Bin 0 -> 1046 bytes images/pagination/record-next.png | Bin 0 -> 1045 bytes images/pagination/record-prev-g.png | Bin 0 -> 429 bytes images/pagination/record-prev.png | Bin 0 -> 1051 bytes images/pagination/record-print.png | Bin 0 -> 818 bytes images/show.png | Bin 0 -> 693 bytes images/show_disabled.png | Bin 0 -> 672 bytes images/thead.png | Bin 0 -> 154 bytes javascript/TableField.js | 2 +- javascript/TableListField.js | 2 +- javascript/tree/tree.css | 12 ++++++------ templates/ComplexTableField.ss | 6 +++--- templates/ComplexTableField_popup.ss | 4 ++-- .../Includes/TableListField_PageControls.ss | 16 ++++++++-------- templates/RelationComplexTableField.ss | 2 +- templates/TableField.ss | 4 ++-- templates/TableListField.ss | 4 ++-- thirdparty/greybox/greybox.css | 5 +---- 46 files changed, 58 insertions(+), 66 deletions(-) create mode 100644 admin/images/arrow_refresh.gif delete mode 100644 admin/images/network-save.gif create mode 100755 images/bullet_arrow_down.png create mode 100755 images/bullet_arrow_up.png create mode 100755 images/checkbox.png create mode 100644 images/delete.gif create mode 100644 images/delete_disabled.gif create mode 100755 images/edit.gif create mode 100644 images/edit_disabled.gif create mode 100755 images/pagination/record-export.png create mode 100755 images/pagination/record-first-g.png create mode 100755 images/pagination/record-first.png create mode 100755 images/pagination/record-last-g.png create mode 100755 images/pagination/record-last.png create mode 100755 images/pagination/record-next-g.png create mode 100755 images/pagination/record-next.png create mode 100755 images/pagination/record-prev-g.png create mode 100755 images/pagination/record-prev.png create mode 100755 images/pagination/record-print.png create mode 100755 images/show.png create mode 100644 images/show_disabled.png create mode 100755 images/thead.png diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index a58fb4c6a..d139e9500 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -280,7 +280,6 @@ class LeftAndMain extends Controller { 'sapphire/admin/javascript/LeftAndMain.js', 'sapphire/javascript/tree/tree.js', 'sapphire/javascript/TreeDropdownField.js', - 'cms/javascript/ThumbnailStripField.js', ) ); @@ -1035,13 +1034,10 @@ class LeftAndMain extends Controller { * @return string */ public function CMSVersion() { - $sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version'); - $cmsVersionFile = file_get_contents(BASE_PATH . '/cms/silverstripe_version'); - + $sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version'); $sapphireVersion = $this->versionFromVersionFile($sapphireVersionFile); - $cmsVersion = $this->versionFromVersionFile($cmsVersionFile); - return "cms: $cmsVersion, sapphire: $sapphireVersion"; + return "sapphire: $sapphireVersion"; } /** diff --git a/admin/css/cms_right.css b/admin/css/cms_right.css index 64433c801..661e5449f 100644 --- a/admin/css/cms_right.css +++ b/admin/css/cms_right.css @@ -585,6 +585,6 @@ } #UploadFormResponse.loading .loading#UploadFormResponse { - background: url(../images/network-save.gif) no-repeat left center; + background: url(../../images/network-save.gif) no-repeat left center; padding-left: 20px; } \ No newline at end of file diff --git a/admin/css/layout.css b/admin/css/layout.css index 79e6e24bd..9029d2543 100644 --- a/admin/css/layout.css +++ b/admin/css/layout.css @@ -197,7 +197,7 @@ body { input.action.loading, input.action.loading:hover { padding-left: 22px !important; - background: url(../images/network-save.gif) 3px 2px no-repeat; + background: url(../../images/network-save.gif) 3px 2px no-repeat; } input.delete:hover, @@ -209,7 +209,7 @@ button.delete:hover, input.loading { padding-left: 16px; - background: #fff url(../images/network-save.gif) no-repeat center left; + background: #fff url(../../images/network-save.gif) no-repeat center left; } input.hidden { @@ -654,7 +654,7 @@ iframe { display: block; width: 20px; height: 20px; - background: transparent url(../../../cms/images/arrow_refresh.gif) no-repeat; + background: transparent url(../images/arrow_refresh.gif) no-repeat; } #Form_EditorToolbarLinkForm select.hasRefreshButton { diff --git a/admin/images/arrow_refresh.gif b/admin/images/arrow_refresh.gif new file mode 100644 index 0000000000000000000000000000000000000000..70941393fdaae65db16114855b7ab2f52bd181c1 GIT binary patch literal 564 zcmZ?wbhEHb6k!lyI2O*JoG7o7te~2zq@Jd%nW3VUt)`Q!Zd9UUT&8DUZDdtvV$)!1 z*KF?4X6e*n?b2=Q)$Quj>+U(x(SL$x;3RL~X|5qt{rqRThfNO%ob4Gr&pULXZ}?)r zq(#wD%L0;@#HKEfi(4I%u_7UUZCJ*t#OyW6Icrn%Hl(F)iB8`ZQ?@xjV`p5}?)aQN z3Ay`{@(v`|>@BX_U)s2@s{UYQptGvd%UghWNZJ)_WqL{6HawZJk>SnROgh_JyXy0PCMH_<6QsD^Al#B zpET$ElsOls%)2;s{>5qYFHK)~X~vQ(vzK3=_kZAk;!hSvE{1vr9R?r(#R&uZ#D@B& z=9bpB_Kwc3?pAT3o_Y;sIVn*kS*|W^Gmn5kUr!e+F}4m(=TIL%FE@J&V?m}4!w`Qb z1zs)=VFAVtMN2Omex7D#hEC}|KJEzfoxy(V=H+q9`M&YVBet(V=S| u78<14w`Nk=V->9FbGs&um%8?87qJQ literal 0 HcmV?d00001 diff --git a/admin/images/network-save.gif b/admin/images/network-save.gif deleted file mode 100644 index 1560b646cff2cc4fd292d7fdb6f7adc7eb484b4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1737 zcmaLXeN0p99l-I&!tEQiv~W&~lv_&SmI|fRw)eE0zR=T_(^9a!crF*Q_O?JP*50BW za+x#6J*VfyIVLB@`G?mSW{fe8%LJS?j`_k2*Er)fUT2(h#u;OrF~)0*amLK)uKSPd z_ve%6mwfVklPAzh+MD7sAOkM}c>DG(0N}=r8~gU{i^XCdkH_!#XEK??hY#PmbLYsB zBQ-TOdcEFcGGQ3zcDqxl)R{A9Dk>_n+3b@iPo6$~y0EaYd-v|n&dz8wdiLzuYuB#f zIId7A#>dBxA3q+6M7D3=e*gY`mSv?<>Cn*7!Gi~r$>gb1r$~|%i^V5SoY=pAe_2@> zpU;2v=+TQ8FUH2ka=F~gmoFiN$BrF){rdHrH*e0LKY#i1-Mo2odV2cVvuD?@ zUw`o6!QH!euU@^nxVSh!KY#Duy<4|#J%9fE_U+r-wrx9k^5pF7Y2!hz{_K}ehqtPf73O8@wtkGyFib|)`J9qAU_vSxN)!U+Q3$?~abhem{rh;Yf zPOJW1?#m|PBZ)!HR~tu$H1Sk?EIk|_G;Yi!he6f93Ps{~w+!$1-$w+3U+n~t&M}Ot zdSwI42rFvpj1a?ZjJW9IPwE??&E&#p9=}A*VhFMy6cm+?16Q*P7E0tZ7Ed$$XgM+i z94(M9MQ3b;8w!dQGl;PjLVE4Y?<_P{QXeB^>`CbQFBvD_OT*#R6y9XGLopA~j#=m{7->pd6t>(Yi=3 zP}uo3V`jwsY7W}yU|ZK5z%f|Z?m9z~uy*yuIRu5uFfoVs{~5H(gmaYV0%%rtm$QvL z{~uwK+1e_?@y3>z>U)~d^%(jpL%ul0QBAF>DcN4YPSb$5Y$@O`J^)4H(vAG6fyV-$ zpp9QFT`ozb8GCfYP#22&x;IILw01D;WQQ6$Rd7I-5KT1ikgn+a(|F~;N5`@Dq1(|Cs^MXKy8P08>2 ze(zaIH}OH&tXIpzRp|f=nv{at6&u#2!XbvJ4yIM4%e%g~!%0&*vz<+T(e8jvJ$eoV zB?T~K5as2YK8NWfo<~YPgTv`>IqKsqR5<(dp)cEDK=00n>#89cvunA{%L%$M)}%E- z+Y7LTL0WhsE#TMm`-=Xj>PZ!`)~ z(K&8wwg6)N&3|FkYgh7U3x!zd`r4lqi5ZME;n0{F5#}>?i)rEJH#GeJiA|m+eZ8DO zSU?f>fl#Gzi`dPes#t)+aBX={4?$xdcO&byCid?1(awZqf1}Z}+v{|OO zt|T#wanNsY&NCKu;zG`1RYSh)xbINpDJ|DFE; D?d&fs diff --git a/admin/javascript/AssetTableField.js b/admin/javascript/AssetTableField.js index 4966ea6c1..1bf5b87ba 100644 --- a/admin/javascript/AssetTableField.js +++ b/admin/javascript/AssetTableField.js @@ -138,7 +138,7 @@ AssetTableField.prototype = { var confirmed = confirm(confirmMessage); if(confirmed) { - img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work + img.setAttribute("src",'sapphire/admin/images/network-save.gif'); // TODO doesn't work new Ajax.Request( link.getAttribute("href"), { diff --git a/admin/javascript/MemberTableField.js b/admin/javascript/MemberTableField.js index fcb091d51..c47816cff 100755 --- a/admin/javascript/MemberTableField.js +++ b/admin/javascript/MemberTableField.js @@ -226,7 +226,7 @@ MemberTableField.prototype = { if(typeof groupId == 'undefined') var groupId = $('Form_EditForm').elements.ID.value; cell = document.createElement('td') - cell.innerHTML = 'delete'; + cell.innerHTML = 'delete'; cell.getElementsByTagName('0'); row.appendChild(cell); diff --git a/admin/templates/Includes/MemberTableField.ss b/admin/templates/Includes/MemberTableField.ss index fa8175d39..9796a93a2 100755 --- a/admin/templates/Includes/MemberTableField.ss +++ b/admin/templates/Includes/MemberTableField.ss @@ -32,7 +32,7 @@ - add<% _t('ADDNEW','Add new',50,'Followed by a member type') %> $Title + add<% _t('ADDNEW','Add new',50,'Followed by a member type') %> $Title <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> diff --git a/admin/tests/LeftAndMainTest.php b/admin/tests/LeftAndMainTest.php index f9d8177eb..af592c3aa 100644 --- a/admin/tests/LeftAndMainTest.php +++ b/admin/tests/LeftAndMainTest.php @@ -88,17 +88,17 @@ class LeftAndMainTest extends FunctionalTest { public function testCMSVersion() { $l = new LeftAndMain(); $this->assertEquals("2.4", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/branches/2.4/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/branches/2.4/silverstripe_version $')); $this->assertEquals("2.2.0", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/2.2.0/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/2.2.0/silverstripe_version $')); $this->assertEquals("trunk", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/trunk/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/trunk/silverstripe_version $')); $this->assertEquals("2.4.0-alpha1", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/alpha/2.4.0-alpha1/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/alpha/2.4.0-alpha1/silverstripe_version $')); $this->assertEquals("2.4.0-beta1", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/beta/2.4.0-beta1/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/beta/2.4.0-beta1/silverstripe_version $')); $this->assertEquals("2.4.0-rc1", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/rc/2.4.0-rc1/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/rc/2.4.0-rc1/silverstripe_version $')); } /** diff --git a/css/ComplexTableField_popup.css b/css/ComplexTableField_popup.css index e3874cd6a..c0cca3048 100755 --- a/css/ComplexTableField_popup.css +++ b/css/ComplexTableField_popup.css @@ -10,7 +10,7 @@ body { } #ComplexTableField_Popup_DetailForm input.loading { - background: #fff url(../../cms/images/network-save.gif) left center no-repeat; + background: #fff url(../images/network-save.gif) left center no-repeat; padding-left: 16px; } diff --git a/css/Form.css b/css/Form.css index 7c683d1ce..be5aa3020 100644 --- a/css/Form.css +++ b/css/Form.css @@ -70,7 +70,7 @@ form button.minorAction { background: none; padding: 0; border: 0; - color: #0074C6; /* same for "a" tag in cms/css/typography.css */ + color: #0074C6; text-decoration: underline; } diff --git a/css/TableListField.css b/css/TableListField.css index ac2e8608f..8bb39c63b 100644 --- a/css/TableListField.css +++ b/css/TableListField.css @@ -33,7 +33,7 @@ table.CMSList th { table.TableField thead th, .TableListField table.data thead th, table.CMSList thead th { - background-image: url(../../cms/images/tables/thead.png); + background-image: url(../images/thead.png); background-repeat: repeat-x; background-position: left bottom; background-color: #ebeadb; @@ -105,7 +105,7 @@ table.TableField tbody td.checkbox, table.CMSList tbody td.checkbox { border : 1px solid #f1efe2; padding-left : 5px; - background-image : url(../../cms/images/tables/checkbox.png); + background-image : url(../images/checkbox.png); background-repeat : repeat-x; background-position : left bottom; } @@ -143,7 +143,7 @@ table.CMSList tbody td.current td { */ .TableListField tr.loading td.first { padding-left: 22px; - background: url(../../cms/images/network-save.gif) 3px 2px no-repeat; + background: url(../images/network-save.gif) 3px 2px no-repeat; } .right form .TableField span.readonly { diff --git a/dev/install/config-form.html b/dev/install/config-form.html index a0d8ade26..a767badd6 100644 --- a/dev/install/config-form.html +++ b/dev/install/config-form.html @@ -270,7 +270,7 @@

diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php index 19c24c52f..c249645eb 100644 --- a/forms/ComplexTableField.php +++ b/forms/ComplexTableField.php @@ -138,20 +138,20 @@ class ComplexTableField extends TableListField { public $actions = array( 'show' => array( 'label' => 'Show', - 'icon' => 'cms/images/show.png', - 'icon_disabled' => 'cms/images/show_disabled.png', + 'icon' => 'sapphire/images/show.png', + 'icon_disabled' => 'sapphire/images/show_disabled.png', 'class' => 'popuplink showlink', ), 'edit' => array( 'label' => 'Edit', - 'icon' => 'cms/images/edit.gif', - 'icon_disabled' => 'cms/images/edit_disabled.gif', + 'icon' => 'sapphire/images/edit.gif', + 'icon_disabled' => 'sapphire/images/edit_disabled.gif', 'class' => 'popuplink editlink', ), 'delete' => array( 'label' => 'Delete', - 'icon' => 'cms/images/delete.gif', - 'icon_disabled' => 'cms/images/delete_disabled.gif', + 'icon' => 'sapphire/images/delete.gif', + 'icon_disabled' => 'sapphire/images/delete_disabled.gif', 'class' => 'popuplink deletelink', ), ); diff --git a/forms/FileIFrameField.php b/forms/FileIFrameField.php index ffb912069..098637e20 100755 --- a/forms/FileIFrameField.php +++ b/forms/FileIFrameField.php @@ -107,7 +107,6 @@ class FileIFrameField extends FileField { Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript('sapphire/javascript/FileIFrameField.js'); - Requirements::css('cms/css/typography.css'); Requirements::css('sapphire/css/FileIFrameField.css'); return $this->renderWith('FileIFrameField'); diff --git a/forms/TableListField.php b/forms/TableListField.php index 9db0a2f66..b2bec1116 100755 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -117,8 +117,8 @@ class TableListField extends FormField { * array( * 'delete' => array( * 'label' => 'Delete', - * 'icon' => 'cms/images/delete.gif', - * 'icon_disabled' => 'cms/images/delete_disabled.gif', + * 'icon' => 'sapphire/images/delete.gif', + * 'icon_disabled' => 'sapphire/images/delete_disabled.gif', * 'class' => 'deletelink', * ) * ) @@ -126,8 +126,8 @@ class TableListField extends FormField { public $actions = array( 'delete' => array( 'label' => 'Delete', - 'icon' => 'cms/images/delete.gif', - 'icon_disabled' => 'cms/images/delete_disabled.gif', + 'icon' => 'sapphire/images/delete.gif', + 'icon_disabled' => 'sapphire/images/delete_disabled.gif', 'class' => 'deletelink' ) ); diff --git a/images/bullet_arrow_down.png b/images/bullet_arrow_down.png new file mode 100755 index 0000000000000000000000000000000000000000..7f33a1e10a56421ebb40f4c111d8168331de6737 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)J!2%>%=H$-?Qc<2Rjv*Yf$q5Sb268|CcRy4= z%-{B&=f1?g+Vr3QdS`aGH}*C*KNLTFe74T~sr7dfA3sZ}IQZei@AV39Y;7xr;@=e) x+x+?$ocu^xVS3}jkVogAu0OU}ZsH3ThPB5PDtvjTx&v)t@O1TaS?83{1OQ!cIspIx literal 0 HcmV?d00001 diff --git a/images/bullet_arrow_up.png b/images/bullet_arrow_up.png new file mode 100755 index 0000000000000000000000000000000000000000..af5639c41850f0e7a34e85d70f340ea5d5800498 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)J!2%>%=H$-?Qo)`sjv*Yf$q5Sta;8T7t(quv zLO_kJEmTPUy>Um)o{Nkk2{Ec4AM;6@s~_fWYrkKgXsPlAey9-u r3JQ9gTe~DWM4flX@ws literal 0 HcmV?d00001 diff --git a/images/delete.gif b/images/delete.gif new file mode 100644 index 0000000000000000000000000000000000000000..27dfea12f656943d3955ba912f18f4cd950a88d9 GIT binary patch literal 356 zcmZ?wbhEHb6krfwxN5<$N0{Nb0>is4%RlQfe7|}5jv~V*9)@eqs?(h94#_foymIN8 z8p9cBrbD6(mt+{0vN6nIV_3t>uvwVn>FTAY)~-F|<1x+BWMg~#yNeh9xQM+!w*R^s z=dRxFE6VJr6*!LdcfMG+?B0?kmzrDeX|O+BzGQ;E&5Fv(RW=4E#2MB*n_ikQ;e|TG zq5Q%=28M|Y4Etml7V>dCpIE<)i(#)M$Gyye{}${$cDDbG8UFwO&wvdm{$ycfV6b4& z0ZD@V#K6|*FsHynhbwtYzo7f7mbR_Y41sf0cnqc*6i*In6=plYu#khZ{hbK=s|5^3 z(t>w==eYH`xx_8u4`bzHsBz0+=4Ng7c49JZXXRDx?lte{5o&RsVy-VH%~LgVHfIr+ pT(Uq*U{DK}F&n?GxKkkGObad{emylODNPw~2_>EGV-}7K)&R_9cl!VU literal 0 HcmV?d00001 diff --git a/images/delete_disabled.gif b/images/delete_disabled.gif new file mode 100644 index 0000000000000000000000000000000000000000..0e769c07524bdff8997c8e95b7b63a3a559b7f32 GIT binary patch literal 230 zcmZ?wbhEHb6krfwIKlt|*4Ea}&dy$5UO_=Yk&%%}Nl7_5IVB|}RaI3jEiF@~Oqn}( z?vf=-Hf`FpW5v!(l0qZ6}DE?&O)ehl x$CquYjNY&;xkL53ZP4+#le2`c?G|fg2a&0D#Jl99zG-}NStWws(~ zPO#b6E*@Q4u=q6_pogpM?3AtT0J9sYPheNKfmA9jP=9Z5fvA>)HzrQ|z24{js;oO1 z+Q9*GCFP6OumPS{rBd;W1?caSF z<>pH*l;Od_3AK6+Sy-SCQU1gw&&SeMX&X=$Nce(|Mw59I%y zV^By~i)>%+$)ejOe38JeUSYROr_0L3Bjb4dJ)6;#O)MzH7t?5B7K?e?6vyF;2F{<~ zhr{98bx*&tjgRSVu00x!$L&&B-GC@0BI6>V@P%E_)7aR!v*Y=Z zeL*JEnVtVm=?ru_U7s4I*IO;KFI#DBq%^&&ONk(e$%c4+zU=G*VhL$|9rgMAg3)O@ zU8*<{Y2E@1=HxTpj8X~9WaHm3u=Wn>lmd1jXh{i?@i>##D#hcAH5#?ajv7$V*Eef4 znzV#;7>0QV_Ser5`21x)pC8?Z86IAmHaR?A&$G4xM<>&0MXK(XuB`8&dY#p31pq+* z`>>v%00@#phhIxyKLNeD2L(TkSLH~mugH$xJ-03;*L;fkDU47A&$OS*e=p!{bjKf$ zzKS{A@F8pBVRsZGJS(uQwl*>%#}L$)rhqUhSJSGLjs)BrSIn=PZ4JCj4puXWy=&_N`v`qPvG5JShN7l3VagJRN3On*3X5rm% zsU5-@gJ&xCH~*Zpp{ibJh{MMc%s)y>V#y}i8?Cr+F*XU?KU zi`J}Jvw8F8-Me=mK79D}>C=}lU%q|&_M=CSUcY|*>C>klKfeF@^9O7gI-&TJg_Dax zl0gR~0kV^Ub=?9{Lq3(j(ALx`i9R!q$apN$IUAhHYp5}qjrn1bC|7saSpkhHVjM>v zCM>X0>uzG0xYk(=4GIB}uN6Mg{^{+LS16fsc& zC4LbB4sPwr6wNGNAwdqVNtFUTomt$RK>}@+$|7O{!l69E70ZOUHF|k9MR=DVsqL=`MLQ7SMFM-$Y2cs{e5Z< literal 0 HcmV?d00001 diff --git a/images/pagination/record-export.png b/images/pagination/record-export.png new file mode 100755 index 0000000000000000000000000000000000000000..dd34cf6e5a6a178bf47efc5ab568f616f5a4e671 GIT binary patch literal 817 zcmcIh{Yw*Z7{8kv&DG4e3MJtzB`-v~=*6RqyXkPdrs=6L&mi4-YMGchNfATm7%Ea` zOUs7DU=xO0s7y$hAd8tOOS2}Fj7sTC5Zn(+2Nhgb{S7_vJfG)zcz8a~%Rp&Kky@3i zf*?q(*A>zdCQF*AjFIfkxVU2y$Q#IF5`vz;Iug=-EcXH0=Nz#O>|?06f1dU{yG(O}9I}kq-bZMp-A# zx@nik#n?dC1ka8N(QV*e2!~dp%!EW8wvJi@D^bb<+MEJf8y0p2??OP+2^^k))gxkh z)IKi;f)VeWt7%*aZva%9XPl1$o@u6CK~cluRI`S*0o;OneJ<9=r01n~+3YTle`rR; zyYaROVaUT%BNXFf#J?gKF~4+Q&P63nSL|;f&bi6m|7G;pEAAX7u z5Ufb*A&7k9@#fZg@nBkpGM+#dYbrBypBN8vlO5MCtB0j3vO;B4?%J;3n4X=z&?kpw z%B;pQhhr6fxw@Rwo4t;ZJ&;UA6(}-y%rD-V2nz(ulk2e0A8!ro42GSC>BF&VSS6Fk zm#(Evoh>6DtXF2BBm1)?HiAs+M+)e~<0mF#b@50~kHv6zHEP=WHGz~>=UjRwvG>Y* zPj>EQB&iAK%#ZIVDm722NbplTXE?<`YRn_4uWrp&WY=bwU9CQvk-GD6L?*34oHSN`}@qsDNb$p!_fO-}1ITElNLu^xBd_pQgt0 E8+83-w@*$^Zf|c74i3i0$HT(HBoawuV_4W0&wzk^a+ozf5D3tj4_|VW$I-M?;%XvIrNl8g`baZNJs#q-E*w~1SjJ&(M%g@i}^ZC#JJ}49l zjYjL}=;-R|>gnlWFc^J(eFFmnLqkI>7Hec=gu~&Cjg3uAOiWEp&CJZq&CM+=EG#W8 zt*or9t*!BRyp4?wfj}S$J4A^z?K9m6@5Dm6Zi9 zz!$Irya1t~paAF<6%`d17Xv83TUJ&E@WDc5Wo1=W6=(uAY&N^5rlz*Gwyv%YG=c7h zh6a$^)YJsZT3T8_Q(IdbxNdK62fu*5v$GQ%b$567^z`)h_JT?fJuomZI5-F;fUl8} zkp%y3s!dqQk zg(e}h_4RcyE0sz&H#cQ6+1Az;)VQ;=v%9+ssX(jHFL?o+4=do zLZP_0xVXH$gq*IguWxQ{pkXKk5{1+uc<2o>LEE!kvG2Z7zuc4z|ISQA7?FR7g`5bbKeJn&_#8pq zp^#$3rA>)QtQ_A!Q_7K=@-HepHg%TJwqB@KHYgMDKL~!4cVUgC(z6!!i}}w#Ff~+u hP5tR()E6&azDD)~Gi+tJ5Dd(WptLZWoWBVX{{X^PyP*I8 literal 0 HcmV?d00001 diff --git a/images/pagination/record-first.png b/images/pagination/record-first.png new file mode 100755 index 0000000000000000000000000000000000000000..a1a52cc4c8bd29376aa03a7adbe0dadf81aed92a GIT binary patch literal 1142 zcmcJP=TG7X7{@tHj9z-Cv6sf$zVO;N-o>=_;u~}4T`^A5Gaff$Ocx-aq9TG5C*sD9 zdk-8axN(9TK}2zZii(N@aEmBQ+h5whp-=LBzb~IB`F@@!)5qK6$zz+xAQ0$@m!~Tf z@TWjqnVSL{Y-#yDVBZkjdyZW8p|!uMij-2}Q#EV{m-rYY@m3?^nt+Ok@YCzGP#EOiXf)_`JO2uRs`$ zMj{>KM}lC|5VE5Uzg!4sjHOWQzx(Z7{~}GHl#^L_3I{J)mxz```-l6xhZ|G@F(d(H zFz9sJyVxv3K|`|kR)c3EsB{Wvbr4E&aq@D)RQQF*hl_-K;leDMfWE)Khv8r@?_GF8 zo>rr&@1*)=LCC{+#i<+-52ba`j*s_VL0)-$@}M-3sZA9A%GfizXV5^XT7CKO@X$O_ z`_}ud!)phZPcCdZjWfnE>h%iccDJC7E9;RDJ&Q^WXm#3LPJBb zSZr8W7!HRE4-d!V@dN@PA|fI(GBPSEDmpqkCMG5}HkL>v#>K_O$HylmBqSy#CM6{$ zCnu9gq?D8tGMSv3nwplDmY$xTk&%&^nVFT9m7SeUp-^&ia&mKX^YZfY^YaS|3JMDg zi;9YBeM3V-V`F1e zQxlCwYi@3CX=!O~ZEb67qtof_?d=^M9SjD8$z*nRc6N1jb$567^z`)h_V)Gl_4oI) zSge78fx*GSp`oGS;o*^ykdAeCMG5)C#R;Srl+T8W@flt?(FO= zkH_Ql`Ezq~0)b$DeqJaPE-Wl8E-s2hqNSy!<>lp-m6g@i)wQ)Xu~;mTNY>ZaH#Rml zH#enH>DJcP_V)J9&W=nb+uhyW+uPgU--7eM0iYK^3m^oD z_owvIG~i%h1gQ6i|Kk4t6vRxzIsn6JyLow59FR0c_Q^F^=y+iDw4}$>%5rasIq|bp=;Zp{S5KW>M}4-G wv#RQR+eMp9)ejbR?=9SM2WI9la1!tre)%I5Ttxjn3Ro57<>u|mboq<)4=Rtq8~^|S literal 0 HcmV?d00001 diff --git a/images/pagination/record-last-g.png b/images/pagination/record-last-g.png new file mode 100755 index 0000000000000000000000000000000000000000..ede7e36c47c60eb0b54f1180c22b4f5238ce1d52 GIT binary patch literal 1095 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 F&p$BlWZeJ& literal 0 HcmV?d00001 diff --git a/images/pagination/record-next.png b/images/pagination/record-next.png new file mode 100755 index 0000000000000000000000000000000000000000..f6c055063d77040997088ed57d5aca8b58aa75b5 GIT binary patch literal 1045 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3-p0n&d&0WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW`+Qt5Z9Jz)e;I4UZqYwhl|f$KGrg;ddZ%-#jBF{zFyn1 zEjxKq(5&^7=Wm?RvZ>h6(QxVQo*idaO*!5&W%-o7&zBZ2N*np7v!_Mv+rMq? z<0;8~LA{Gx6*Uw!O*HpDUV7oiiRJqiocp}>{FURI53j3UmHqJ9t*wuj?%2A)($lhf zQuVR-Yp1U6ZP}E)_xak+d7a6n$vby#TEAxbobxR`i&}sl83m&uK+_O-|84#}parHS zL4Lvi$p8#BTQ7jJVwR_iV@SoVBm+lAo+AY}Ljrf);`wwUCfSlrRU_QNab|mH_=HB* zL#e@69tngcUt|2(7?T(1S*M)lSEg5M5I(Cp+|^~y+|EFrGpSQ2KD|64DapiPhR%^A rEBaC<$}Lvhw0D+}N(CdkxWWO3MpkWk@i#8^pm6bY^>bP0l+XkK4R6}V literal 0 HcmV?d00001 diff --git a/images/pagination/record-prev-g.png b/images/pagination/record-prev-g.png new file mode 100755 index 0000000000000000000000000000000000000000..432558ad597ad8623c474521e6b3d4c28fdac089 GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3-p0n&d&0WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8nE^f_u2of47cX8cE-pTQ{`}6JJMZ4TJ9FmD_3PKae*OC8 z%a`@_^)Ft$ICJLAj2Sa(Yikc4Jb2;4g|f1;sZ*z(I(2H#o;{BqJ$mrq!S(Cc@7%ew zef#!}8#lJJwA{ac|K7cOy}iAyt*t#hJu6nM*uQ`Oq)C(J%$alP(xr9l);)dtw5_e} zeZ1WM|SPnb?)4`hYugVdGluW?Abuqt(|j521pr~1o;L3CmApl&fD7u z)Sm6>;uunKE6Ko#k>^N(rOJezY=?3@V))WZSy`sfo;f+x*=3R|=b5W%Pf}7v#4lWV z$W;7wN2+AykH{Omk_Tc8Q_JLHO?5>T)jHxNEnPMB*wh>=SDajwv!~|7w^zmn3wC&g i&SKGj@PLU$f??Ja&D`Xuj|+j;GI+ZBxvX2CH(Yyc`O?F4qPo1EKD}4HD*Mv4OH&T__(c1(>?)pey4uXu ztaw)PlvO>2pH91|rd^so+fn{~t~ z*XpKt@k^@PLU$g5j2s{^5me6;DCI;pyt?86;$Hv& literal 0 HcmV?d00001 diff --git a/images/pagination/record-print.png b/images/pagination/record-print.png new file mode 100755 index 0000000000000000000000000000000000000000..02926897c8515f9f5156f3fb83ffa7eb821047b1 GIT binary patch literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3-pG`1q876id3JuOkD)`V;1?T`z%r$r9Iy zlHmNblJdl&R0hYC{G?O`&)mfH)S%SFl*+=BsWuD@j5+~6A+Cm=$^U=<_e!kZd-~qm zeb>BVtB;+&HfPn&p-eF`0?Za z|No}!`hN1%$(}`fi`$m2-mn>{=i?E3qAkH0^E{eA2C?{ik|eem$X zz57o$Z$EJE`t#lU4_0^0*?#Qy#Q8gtOMA{;ejb!q{rB(R;-)!MObp)xy%Smd``7Pt zx8E;4{C?@Wz16*os{591J^p;fmc#cRzyJOF_qF@)k6pf3J!!3_Z}yZ$TmOTBPH*UT zVBn^d1o;I+L}*GfsP*L90^>=>)5S5Q;#QK!F(wA44#wFE4h)X0$uTo#mPR%l5I(}p zq0q5lzFD!5fI*kmrYNSJ42&#-ACl@qo;^J_Vi)~<1mE~LgfcK5nV_S2W_`lq z1<9|@pFN^|DE};%2n&b8f(5%=gd{$EJYmsM-5kQiBH+Af+7yQHh(%M{17rVb2=yjBeihqO2Z5*WA- WCKoMzsgn(i7Y0vPKbLh*2~7YVB*YH@ literal 0 HcmV?d00001 diff --git a/images/show.png b/images/show.png new file mode 100755 index 0000000000000000000000000000000000000000..921d077523573b598274935b6ccc25becff749b4 GIT binary patch literal 693 zcmV;m0!safP)AEJKxOl%sBVUF-Jy?bQ&+CIB2G!v`DQ*ZG<8XyHHTk!bL<-P`Yc;LN`L; zBFII7kU>dE7lgznlO{D%$BY?A^D=pDMrY=nuSL0u6W9YUysIC7fa5y-qD8uS<5(X26wJeWhQCoxG_ojU-9*h4C za1|AGt&!{!WH}gIP8G^b6r2QjTs$l$0-Z)ie$!EHfqVZor2n^VlwnbiVQP_iX-3wm;u-T*a1wAj)fF~(1*V6&6OxLsT8a05)uSp00aOA z0J{jm#PB#i`3Jfbfx)2{H>V%oPo(O2Xi`;>86e~Lfe>s+67Jq=hdMGo4r2G2lGX0+%W(E=RNdDu&a_u-#gfRTQ=)C!3X!4se$ek7+zq3@aU}1 zV_#~_s=os9=ZMi7TRXmE0071!EHLSt@fC^-jZv`#&jY#Ae*pk6wShoh&cVUpnll|k#($m^>tM*;j00000NkvXXu0mjf;36-~ literal 0 HcmV?d00001 diff --git a/images/show_disabled.png b/images/show_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c1191a28a6a5b2fccb635ce5993573782dd3dc GIT binary patch literal 672 zcmV;R0$=@!P)c-*@g4!HxNRzRgf5w5QYQf)a^@8;{4GTrT%Ll}f#Bx7)3G-tt#O2eDY}<<{2L z$F;RJ&}y~7vMflYQW%X!aCUY!JvcacT(8%EEfgp;?r&Dk^9H3UK0gE9L ziOBqZ|C{Av@)_c+(P)6z9;%pTH>!`W=M*Er4~f|x6n z3SX<$l9>E85C}ZS$M%^zDwoUWhlhucI-O2$4sz$$>-9cMr_(~C(GZS~j)X)aQNt0d zsgNk#X;{cttJPDh)f(O2euCp3sPX+o@$A#R0O$t%7kH#~s@EH$J3B!X_m3JWy|_03 zfi#;;v$|djv*Ddk`mGsSR^GSBxW!$@i4F)VKASd9exBT&*16m=d#Wzp$P!N <% if SortDirection = desc %> - <% _t('SORTASC', 'Sort ascending') %> + <% _t('SORTASC', 'Sort ascending') %> <% else %> - <% _t('SORTDESC', 'Sort descending') %> + <% _t('SORTDESC', 'Sort descending') %> <% end_if %>   @@ -49,7 +49,7 @@ - <% _t('ADDITEM', 'add') %> + <% _t('ADDITEM', 'add') %> <% sprintf(_t('ADDITEM', 'Add %s', PR_MEDIUM, 'Add [name]'),$Title) %> diff --git a/templates/ComplexTableField_popup.ss b/templates/ComplexTableField_popup.ss index 5a47bbe53..d384b3710 100755 --- a/templates/ComplexTableField_popup.ss +++ b/templates/ComplexTableField_popup.ss @@ -15,7 +15,7 @@ <% if Paginator.PrevLink %> - <% _t('PREVIOUS', 'Previous') %> + <% _t('PREVIOUS', 'Previous') %> <% end_if %> <% if xdsfdsf %> @@ -32,7 +32,7 @@ <% end_if %> <% if Paginator.NextLink %> - <% _t('NEXT', 'Next') %> + <% _t('NEXT', 'Next') %> <% end_if %> diff --git a/templates/Includes/TableListField_PageControls.ss b/templates/Includes/TableListField_PageControls.ss index bd66c2bc3..d22642eb8 100755 --- a/templates/Includes/TableListField_PageControls.ss +++ b/templates/Includes/TableListField_PageControls.ss @@ -1,17 +1,17 @@ <% if ShowPagination %> <% if TotalCount %>
- <% if FirstLink %><% _t('VIEWFIRST', 'View first') %> $PageSize - <% else %><% _t('VIEWFIRST', 'View first') %> $PageSize<% end_if %> - <% if PrevLink %> - <% else %><% _t('VIEWPREVIOUS', 'View previous') %> $PageSize<% end_if %> + <% if FirstLink %><% _t('VIEWFIRST', 'View first') %> $PageSize + <% else %><% _t('VIEWFIRST', 'View first') %> $PageSize<% end_if %> + <% if PrevLink %> + <% else %><% _t('VIEWPREVIOUS', 'View previous') %> $PageSize<% end_if %> <% _t('DISPLAYING', 'Displaying') %> $FirstItem <% _t('TO', 'to') %> $LastItem <% _t('OF', 'of') %> $TotalCount - <% if NextLink %> - <% else %><% _t('VIEWNEXT', 'View next') %> $PageSize<% end_if %> - <% if LastLink %><% _t('VIEWLAST', 'View last') %> $PageSize - <% else %><% _t('VIEWLAST', 'View last') %> $PageSize<% end_if %> + <% if NextLink %> + <% else %><% _t('VIEWNEXT', 'View next') %> $PageSize<% end_if %> + <% if LastLink %><% _t('VIEWLAST', 'View last') %> $PageSize + <% else %><% _t('VIEWLAST', 'View last') %> $PageSize<% end_if %>
<% end_if %> diff --git a/templates/RelationComplexTableField.ss b/templates/RelationComplexTableField.ss index a8b78fac4..c4127528e 100644 --- a/templates/RelationComplexTableField.ss +++ b/templates/RelationComplexTableField.ss @@ -34,7 +34,7 @@ - <% _t('ADD', 'Add') %><% _t('ADD', 'Add') %> $Title + <% _t('ADD', 'Add') %><% _t('ADD', 'Add') %> $Title <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> diff --git a/templates/TableField.ss b/templates/TableField.ss index 9dd43debe..2792e2172 100755 --- a/templates/TableField.ss +++ b/templates/TableField.ss @@ -30,7 +30,7 @@ <% if Can(add) %> - <% _t('ADD','Add a new row') %> + <% _t('ADD','Add a new row') %> <% sprintf(_t('ADDITEM','Add %s'),$Title) %> @@ -47,7 +47,7 @@ $Field <% end_control %> $ExtraData - <% if Can(delete) %><% _t('DELETE') %><% end_if %> + <% if Can(delete) %><% _t('DELETE') %><% end_if %> <% end_control %> <% else %> diff --git a/templates/TableListField.ss b/templates/TableListField.ss index 0d4e834ea..554bbaf32 100755 --- a/templates/TableListField.ss +++ b/templates/TableListField.ss @@ -24,9 +24,9 @@ <% if SortDirection = desc %> - <% _t('SORTDESC', 'Sort in descending order') %> + <% _t('SORTDESC', 'Sort in descending order') %> <% else %> - <% _t('SORTASC', 'Sort in ascending order') %> + <% _t('SORTASC', 'Sort in ascending order') %> <% end_if %>   diff --git a/thirdparty/greybox/greybox.css b/thirdparty/greybox/greybox.css index fdb850064..e267522f1 100644 --- a/thirdparty/greybox/greybox.css +++ b/thirdparty/greybox/greybox.css @@ -22,11 +22,8 @@ } .GB_header { - /*border-bottom: 1px solid #ccc;*/ border-bottom: 3px solid #CCDEF3; - /*background: #000 url(../../cms/images/textures/obar-18.gif) repeat-x;*/ - background: #ccdef3 url(../../cms/images/mainmenu/current.gif) repeat-x; - /*color: #fff;*/ + background: #ccdef3 url(../../admin/images/mainmenu/current.gif) repeat-x; color: #555; }