Rename permissions icons to correspond to view states, move to lib/images. Fixed references to them in the edit permissions view.

7 files changed, 12 insertions, 12 deletions

diff --git a/themes/wind/images/ico-denied-gray.png b/lib/images/ico-denied-inactive.png
index 56db3ff5..56db3ff5 100644
--- a/themes/wind/images/ico-denied-gray.png
+++ b/lib/images/ico-denied-inactive.png
diff --git a/themes/wind/images/ico-denied-pale.png b/lib/images/ico-denied-passive.png
index 1e992230..1e992230 100644
--- a/themes/wind/images/ico-denied-pale.png
+++ b/lib/images/ico-denied-passive.png
diff --git a/themes/wind/images/ico-denied.png b/lib/images/ico-denied.png
index 08f24936..08f24936 100644
--- a/themes/wind/images/ico-denied.png
+++ b/lib/images/ico-denied.png
diff --git a/themes/wind/images/ico-lock.png b/lib/images/ico-lock.png
index 2ebc4f6f..2ebc4f6f 100644
--- a/themes/wind/images/ico-lock.png
+++ b/lib/images/ico-lock.png
diff --git a/themes/wind/images/ico-success-gray.png b/lib/images/ico-success-inactive.png
index 74b2032f..74b2032f 100644
--- a/themes/wind/images/ico-success-gray.png
+++ b/lib/images/ico-success-inactive.png
diff --git a/themes/wind/images/ico-success-pale.png b/lib/images/ico-success-passive.png
index dc8d1ded..dc8d1ded 100644
--- a/themes/wind/images/ico-success-pale.png
+++ b/lib/images/ico-success-passive.png
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index e2871adb..f66f3144 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -20,11 +20,11 @@
 
         <? if ($lock): ?>
           <td class="g-denied">
-            <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>"
+            <img src="<?= url::file("lib/images/ico-denied.png") ?>"
                  title="<?= t('denied and locked through parent album')->for_html_attr() ?>"
                  alt="<?= t('denied icon')->for_html_attr() ?>" />
             <a href="javascript:show(<?= $lock->id ?>)" title="<?= t('click to go to parent album')->for_html_attr() ?>">
-              <img src="<?= url::file(gallery::find_file("images", "ico-lock.png")) ?>" alt="<?= t('locked icon')->for_html_attr() ?>" />
+              <img src="<?= url::file("lib/images/ico-lock.png") ?>" alt="<?= t('locked icon')->for_html_attr() ?>" />
             </a>
           </td>
         <? else: ?>
@@ -32,22 +32,22 @@
             <? if ($allowed): ?>
               <td class="g-allowed">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)" title="<?= t('allowed through parent album, click to allow explicitly')->for_html_attr() ?>">
-                  <img src="<?= url::file(gallery::find_file("images", "ico-success-pale.png")) ?>" alt="<?= t('passive allowed icon')->for_html_attr() ?>" />
+                  <img src="<?= url::file("lib/images/ico-success-passive.png") ?>" alt="<?= t('passive allowed icon')->for_html_attr() ?>" />
                 </a>
                 <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('click to deny')->for_html_attr() ?>">
-                  <img src="<?= url::file(gallery::find_file("images", "ico-denied-gray.png")) ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
+                  <img src="<?= url::file("lib/images/ico-denied-inactive.png") ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
                 </a>
               </td>
             <? else: ?>
               <td class="g-denied">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('click to allow')->for_html_attr() ?>">
-                  <img src="<?= url::file(gallery::find_file("images", "ico-success-gray.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
+                  <img src="<?= url::file("lib/images/ico-success-inactive.png") ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
                 </a>
                 <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('denied through parent album, click to deny explicitly')->for_html_attr() ?>">
-                  <img src="<?= url::file(gallery::find_file("images", "ico-denied-pale.png")) ?>" alt="<?= t('passive denied icon')->for_html_attr() ?>" />
+                  <img src="<?= url::file("lib/images/ico-denied-passive.png") ?>" alt="<?= t('passive denied icon')->for_html_attr() ?>" />
                 </a>
               </td>
             <? endif ?>
@@ -56,30 +56,30 @@
             <td class="g-denied">
               <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                 title="<?= t('click to allow')->for_html_attr() ?>">
-                <img src="<?= url::file(gallery::find_file("images", "ico-success-gray.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
+                <img src="<?= url::file("lib/images/ico-success-inactive.png") ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
               </a>
               <? if ($item->id == 1): ?>
-                <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>" alt="<?= t('denied icon')->for_html_attr() ?>" title="<?= t('denied')->for_html_attr() ?>"/>
+                <img src="<?= url::file("lib/images/ico-denied.png") ?>" alt="<?= t('denied icon')->for_html_attr() ?>" title="<?= t('denied')->for_html_attr() ?>"/>
               <? else: ?>
                 <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('denied, click to reset')->for_html_attr() ?>">
-                  <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>" alt="<?= t('denied icon')->for_html_attr() ?>" />
+                  <img src="<?= url::file("lib/images/ico-denied.png") ?>" alt="<?= t('denied icon')->for_html_attr() ?>" />
                 </a>
               <? endif ?>
             </td>
           <? elseif ($intent === access::ALLOW): ?>
             <td class="g-allowed">
               <? if ($item->id == 1): ?>
-                <img src="<?= url::file(gallery::find_file("images", "ico-success.png")) ?>" title="<?= t("allowed")->for_html_attr() ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
+                <img src="<?= url::file("lib/images/ico-success.png") ?>" title="<?= t("allowed")->for_html_attr() ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
               <? else: ?>
                 <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('allowed, click to reset')->for_html_attr() ?>">
-                  <img src="<?= url::file(gallery::find_file("images", "ico-success.png")) ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
+                  <img src="<?= url::file("lib/images/ico-success.png") ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
                 </a>
               <? endif ?>
               <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                 title="<?= t('click to deny')->for_html_attr() ?>">
-                <img src="<?= url::file(gallery::find_file("images", "ico-denied-gray.png")) ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
+                <img src="<?= url::file("lib/images/ico-denied-inactive.png") ?>" alt="<?= t('inactive denied icon')->for_html_attr() ?>" />
               </a>
             </td>
           <? endif ?>