From 36cceb4d6b7fa38cddb7350c71155cbf75e3fb55 Mon Sep 17 00:00:00 2001 From: Olav Morken <olav.morken@uninett.no> Date: Wed, 13 Jan 2010 12:16:46 +0000 Subject: [PATCH] Remove duplicate image: delete.png git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2114 44740490-163a-0410-bde0-09ae8108e29a --- modules/core/templates/frontpage_config.tpl.php | 4 ++-- modules/modinfo/templates/modlist.php | 4 ++-- modules/sanitycheck/templates/check-tpl.php | 2 +- templates/frontpage.php | 4 ++-- www/resources/icons/delete.png | Bin 715 -> 0 bytes 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100755 www/resources/icons/delete.png diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php index 4b03b0c4a..8d1d8c2c1 100644 --- a/modules/core/templates/frontpage_config.tpl.php +++ b/modules/core/templates/frontpage_config.tpl.php @@ -40,7 +40,7 @@ if ($this->data['isadmin']) { <?php $icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />'; - $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />'; + $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="disabled" />'; ?> <tr class="<?php echo $this->data['enablematrix']['saml20-idp'] ? 'enabled' : 'disabled'; ?>"><td>SAML 2.0 IdP</td> @@ -82,7 +82,7 @@ if ($this->data['isadmin']) { $icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />'; - $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />'; + $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="disabled" />'; foreach ($this->data['funcmatrix'] AS $func) { diff --git a/modules/modinfo/templates/modlist.php b/modules/modinfo/templates/modlist.php index 9e6532c2c..08110bd6b 100644 --- a/modules/modinfo/templates/modlist.php +++ b/modules/modinfo/templates/modlist.php @@ -4,7 +4,7 @@ $this->includeAtTemplateBase('includes/header.php'); #$icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="' . #htmlspecialchars($this->t(...)" />'; -#$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />'; +#$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="disabled" />'; ?> @@ -23,7 +23,7 @@ foreach($this->data['modules'] as $id => $info) { echo('<td><img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="' . htmlspecialchars($this->t('{modinfo:modinfo:modlist_enabled}')) . '" /></td>'); } else { - echo('<td><img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="' . + echo('<td><img src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="' . htmlspecialchars($this->t('{modinfo:modinfo:modlist_disabled}')) . '" /></td>'); } echo('</tr>'); diff --git a/modules/sanitycheck/templates/check-tpl.php b/modules/sanitycheck/templates/check-tpl.php index 6c7450042..c20aa0fc2 100644 --- a/modules/sanitycheck/templates/check-tpl.php +++ b/modules/sanitycheck/templates/check-tpl.php @@ -10,7 +10,7 @@ $this->includeAtTemplateBase('includes/header.php'); if (count($this->data['errors']) > 0) { ?> <div style="border: 1px solid #800; background: #caa; margin: 1em; padding: .5em"> -<p><?php echo '<img style="float: right" src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="Failed" />'; ?> +<p><?php echo '<img style="float: right" src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="Failed" />'; ?> These checks failed:</p> <?php diff --git a/templates/frontpage.php b/templates/frontpage.php index 37cfb9f71..ef3e3b40f 100644 --- a/templates/frontpage.php +++ b/templates/frontpage.php @@ -42,7 +42,7 @@ if ($this->data['isadmin']) { <?php $icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />'; - $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />'; + $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="disabled" />'; ?> <tr class="<?php echo $this->data['enablematrix']['saml20-sp'] ? 'enabled' : 'disabled'; ?>"><td>SAML 2.0 SP</td> @@ -128,7 +128,7 @@ if ($this->data['isadmin']) { $icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />'; - $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />'; + $icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/delete.png" alt="disabled" />'; foreach ($this->data['funcmatrix'] AS $func) { diff --git a/www/resources/icons/delete.png b/www/resources/icons/delete.png deleted file mode 100755 index 08f249365afd29594b51210c6e21ba253897505d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 715 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^zbpD<_bdda}R zAX(xXQ4*Y=R#Ki=l*-_klAn~S;F+74o*I;zm{M7IGS!BGfhpG0#WBR<^wP<{y@L}a zj{l9`CclWKGq0s3Fkr@Kqw;IF?kqdE*{45RCn>XUZsIJ*-lH);oL4L@yLu|#$Tw$7 zlv~#Ig-<try5#4Zl{;^9_NnbV6V&vSs~-M7efsy$JvRL3Co?HLt>5%4DQvy?xd72; z-$Nvgm#XgcT-#RdzG`M+P-fZG6Roego|RNRQg+>VU&gG3eQw7dN!OGVjz4$#&PaKE zTs0wK{_3MHK?jX&V*NgHZ@1oH@>T5OKI@Kcw*_<U+U3n>Z?L$--hZ+oFxBk8&pgjH zLT6r-G)cU9wr+cJXQ5)%N1mE8?myeITJ$3XG8YJLo9FQ39`6}hRl}N$`M)>j^eZTK z9Q;zVR<e8D#vlEP?7Z(Im77X;g+BC~#8Do5@bn%Y9uMOeEf1JWTR2N%UAJtOw98iA zC+0ahZQ&%A{MC)egIe2NtR@Q>JiV3hq)vPhA9u}i-XE7gY7{+K%Jncmuf;gu-9T}M zN_W%3b73v7c{%23MTZ;2uWH)AQt<C1UG1h$A<@TMuPLM~KPVf1Twbl$h<{&{aGI~% zm(ELJUIn73Gu_mjHf-j#Tg!7V=%mz)sp-wS6BI7gaXLTBeR1~ImP<#jy9OQP=6yJC z^#z53)u#70R8IXNzTyO{cK1Oe!yntkdc?h_Czfx|Se$TGp;z>YfN~e}pD&4`OxL46 z?w!}x9`a~&6l4Be$v;oUd{%tEIC<)+;|WSHHSDLpSDz<y=X9S}*+cKGg7?}!f2>($ z)#h#)Jw5STxy4H(UaxX)_9HLT)HhD9oUniHYw_G?RmGQQ%zG13T>gyhVf^-w@t=id YFP+=zStR|Bfq{X+)78&qol`;+02FXV-~a#s -- GitLab