From cb719960089b199281315b91a30023686df489ec Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 12 Aug 2012 17:21:09 +0200
Subject: [PATCH] Change image links to use imagePath function

---
 apps/calendar/templates/calendar.php                |   2 +-
 apps/calendar/templates/share.dropdown.php          |   4 ++--
 apps/contacts/templates/index.php                   |   8 ++++----
 apps/files_versions/templates/settings-personal.php |   4 ++--
 apps/remoteStorage/{ => img}/remoteStorage.png      | Bin
 apps/remoteStorage/templates/settings.php           |   4 ++--
 apps/user_migrate/templates/settings.php            |   2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename apps/remoteStorage/{ => img}/remoteStorage.png (100%)

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index c94cc755ab..15891aafd9 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -44,7 +44,7 @@
 					<form id="choosecalendar">
 						<!--<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>-->
 						<a class="settings calendarsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('calendar', 'icon.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
-						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Settings'); ?>" /></a>
+						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
 					</form>
 					<form id="datecontrol">
 						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index 07b4c4bced..391ae83765 100644
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -33,7 +33,7 @@ echo OCP\html_select_options($allusers, array());
 </select><br>
 <ul id="sharewithuser_list">
 <?php foreach($users as $user): ?>
-	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo  OC::$WEBROOT; ?>/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>
+	<li id="sharewithuser_<?php echo $user['share']; ?>"><input type="checkbox" width="12px" <?php echo ($user['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $user['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
 	<script>
 		$('#sharewithuser_<?php echo $user['share']; ?> > img').click(function(){
 			$('#share_user option[value="<?php echo $user['share']; ?>"]').removeAttr('disabled');
@@ -59,7 +59,7 @@ echo OCP\html_select_options($allgroups, array());
 </select><br>
 <ul id="sharewithgroup_list">
 <?php foreach($groups as $group): ?>
-	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo  OC::$WEBROOT; ?>/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>
+	<li id="sharewithgroup_<?php echo $group['share']; ?>"><input type="checkbox" width="12px" <?php echo ($group['permissions']?'checked="checked"':'')?> style="visibility:hidden;" title="<?php echo $l->t('Editable'); ?>"><?php echo $group['share']; ?><img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action" style="display:none;float:right;"></li>
 	<script>
 		$('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
 			$('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 024b1d150f..744381026a 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -13,9 +13,9 @@
 	<div id="bottomcontrols">
 			<button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button>
 			<button class="svg import tip" title="<?php echo $l->t('Import'); ?>">
-				<img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" />
+				<img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/upload.svg') ?>" alt="<?php echo $l->t('Import'); ?>" />
 			</button>
-			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
+			<button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg') ?>" alt="<?php echo $l->t('Addressbooks'); ?>" /></button>
 		<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
 			<input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" />
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
@@ -69,6 +69,6 @@
 <div id="dialog_holder"></div>
 <!-- End of Dialogs -->
 <menu type="context" id="addressbookmenu">
-	<menuitem label="Delete" icon="core/img/actions/delete.svg" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
-	<menuitem label="Rename" icon="core/img/actions/rename.svg" onclick="alert('Can\'t do that')"></menuitem>
+	<menuitem label="Delete" icon="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem>
+	<menuitem label="Rename" icon="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>" onclick="alert('Can\'t do that')"></menuitem>
 </menu>
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index 7ff016b585..fe9ba381e5 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -4,6 +4,6 @@
 			<strong>Versions</strong><!-- translate using echo $l->t('foo'); -->
 		</legend>
 		<p>This will delete all existing backup versions of your files</p><!-- translate using echo $l->t('foo'); -->
-		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+		<button id="expireAllBtn">Expire all versions<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/apps/remoteStorage/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
similarity index 100%
rename from apps/remoteStorage/remoteStorage.png
rename to apps/remoteStorage/img/remoteStorage.png
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
index 147378dda3..88e1be94da 100644
--- a/apps/remoteStorage/templates/settings.php
+++ b/apps/remoteStorage/templates/settings.php
@@ -1,6 +1,6 @@
 	<fieldset class="personalblock">
 		<?php
-			echo '<img src="../apps/remoteStorage/remoteStorage.png" style="width:16px"> '
+			echo '<img src="'.image_path('remoteStorage', 'remoteStorage.png').'" style="width:16px"> '
 				.'<strong>'.$l->t('remoteStorage').'</strong> user address: '
 				.OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME']
 				.' (<a href="http://unhosted.org/">more info</a>)';
@@ -22,7 +22,7 @@
 					.'> <strong>'.$details['appUrl'].'</strong>: '.$details['categories']
 					.' <a href="#" title="Revoke" class="action" style="display:none" id="revoke_'.$token.'" onclick="'
 					.'revokeToken(\''.$token.'\');this.parentNode.style.display=\'none\';"'
-					.'><img src="/core/img/actions/delete.svg"></a></li>'."\n";
+					.'><img src="'.OCP\Util::imagePath('core', 'actions/delete.svg').'"></a></li>'."\n";
 			}
 		?></ul>
 	</fieldset>
diff --git a/apps/user_migrate/templates/settings.php b/apps/user_migrate/templates/settings.php
index bce5fb2d7c..d6f3e2f8f6 100644
--- a/apps/user_migrate/templates/settings.php
+++ b/apps/user_migrate/templates/settings.php
@@ -2,7 +2,7 @@
 	<legend><strong><?php echo $l->t('Export your user account');?></strong></legend>
 	<p><?php echo $l->t('This will create a compressed file that contains your ownCloud account.');?>
 	</p>
-	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::linkTo('core', 'img/loading.gif'); ?>" /></button>
+	<button id="exportbtn">Export<img style="display: none;" class="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" /></button>
 </fieldset>
 <form id="import" action="#" method="post" enctype="multipart/form-data">
     <fieldset class="personalblock">