From c3e7382f7d0072dddcd101c18760fab6c5d828a3 Mon Sep 17 00:00:00 2001
From: Cake <cake_67@users.sourceforge.jp>
Date: Sat, 16 Jan 2010 11:57:35 +0900
Subject: [PATCH] =?utf8?q?systems=E3=81=AEview=E8=A1=A8=E7=A4=BA=E3=83=AC?=
 =?utf8?q?=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E3=81=AA=E3=81=A9=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/views/systems/admin_index.ctp |  9 ++++-----
 app/views/systems/admin_view.ctp  | 17 ++++++-----------
 app/views/systems/view.ctp        | 10 ++++------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/app/views/systems/admin_index.ctp b/app/views/systems/admin_index.ctp
index fd60569..861b602 100644
--- a/app/views/systems/admin_index.ctp
+++ b/app/views/systems/admin_index.ctp
@@ -30,12 +30,11 @@ foreach ($systems as $system):
 		</td>
 		<td>
 			<?php if ($system['System']['url']): ?>
-			<a href="<?php $system['System']['url']; ?>" target="_blank">
-			<?php endif; ?>
-			<img src="<?php echo $system['System']['image_filename']; ?>" alt="system imagefile">
-			<?php if ($system['System']['url']): ?>
-			</a>
+				<?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+			<?php else: ?>
+				<?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
 			<?php endif; ?>
+			
 			<?php echo $html->link($system['System']['name'], array('action' => 'view', $system['System']['id'])); ?>
 		</td>
 		<td>
diff --git a/app/views/systems/admin_view.ctp b/app/views/systems/admin_view.ctp
index 97e178a..afa5d0e 100644
--- a/app/views/systems/admin_view.ctp
+++ b/app/views/systems/admin_view.ctp
@@ -10,27 +10,22 @@
 		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
 			<?php echo $system['System']['name']; ?><br>
 			<?php if ($system['System']['url']): ?>
-			<a href="<?php $system['System']['url']; ?>" target="_blank">
-			<?php endif; ?>
-			<img src="<?php echo $system['System']['image_filename']; ?>" alt="system imagefile">
-			<?php if ($system['System']['url']): ?>
-			</a>
+				<?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+			<?php else: ?>
+				<?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
 			<?php endif; ?>
 		</dd>
 		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('URL'); ?></dt>
 		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
 			<?php if ($system['System']['url']): ?>
-			<a href="<?php $system['System']['url']; ?>" target="_blank">
-			<?php endif; ?>
-			<?php echo $system['System']['url'] ?>
-			<?php if ($system['System']['url']): ?>
-			</a>
+				<?php echo $html->link($system['System']['url'], $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+			<?php else: ?>
+			&nbsp;
 			<?php endif; ?>
 		</dd>
 		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Sort Order'); ?></dt>
 		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
 			<?php echo $system['System']['sort_order']; ?>
-			&nbsp;
 		</dd>
 		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Use NPC'); ?></dt>
 		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
diff --git a/app/views/systems/view.ctp b/app/views/systems/view.ctp
index 515fbaf..2a4c58c 100644
--- a/app/views/systems/view.ctp
+++ b/app/views/systems/view.ctp
@@ -3,14 +3,12 @@
 	<dl><?php $i = 0; $class = ' class="altrow"';?>
 		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
 		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php echo $system['System']['name']; ?><br>
 			<?php if ($system['System']['url']): ?>
-			<a href="<?php $system['System']['url']; ?>" target="_blank">
+				<?php echo $html->link('<img src="'.$system['System']['image_filename'].'" alt="system imagefile">', $system['System']['url'], array('target'=>'_blank'), false, false); ?>
+			<?php else: ?>
+				<?php echo '<img src="'.$system['System']['image_filename'].'" alt="system imagefile">'; ?>
 			<?php endif; ?>
-			<img src="<?php echo $system['System']['image_filename']; ?>" alt="system imagefile"><br>
-			<?php if ($system['System']['url']): ?>
-			</a>
-			<?php endif; ?>
-			<?php echo $system['System']['name']; ?>
 		</dd>
 		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Detail'); ?></dt>
 		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
-- 
2.11.0