From 93b39eb76d9af40758e431c88a21d22f88d0fc87 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 27 Jun 2013 12:08:58 +0200
Subject: [PATCH] Some UI changes

- Signature / IDS Signature changed to IOC
---
 app/View/Attributes/add.ctp   | 2 +-
 app/View/Attributes/edit.ctp  | 2 +-
 app/View/Attributes/index.ctp | 2 +-
 app/View/Elements/img.ctp     | 5 ++---
 app/View/Events/view.ctp      | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp
index 531d113ed..daa4a6d36 100755
--- a/app/View/Attributes/add.ctp
+++ b/app/View/Attributes/add.ctp
@@ -29,7 +29,7 @@
 		echo $this->Form->input('to_ids', array(
 					'checked' => false,
 					'data-content' => isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc'],
-					'label' => 'IDS Signature?',
+					'label' => 'IOC',
 		));
 		echo $this->Form->input('batch_import', array(
 				'type' => 'checkbox',
diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp
index 0a173116e..8beeaee34 100755
--- a/app/View/Attributes/edit.ctp
+++ b/app/View/Attributes/edit.ctp
@@ -29,7 +29,7 @@
 		echo $this->Form->input('to_ids', array(
 					'checked' => true,
 					'data-content' => isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc'],
-					'label' => 'IDS Signature?',
+					'label' => 'IOC',
 		));
 		echo $this->Form->input('batch_import', array(
 				'type' => 'checkbox',
diff --git a/app/View/Attributes/index.ctp b/app/View/Attributes/index.ctp
index 8aeb97023..28adf5afc 100755
--- a/app/View/Attributes/index.ctp
+++ b/app/View/Attributes/index.ctp
@@ -33,7 +33,7 @@ if ($isSearch == 1) {
 			<th><?php echo $this->Paginator->sort('type');?></th>
 			<th><?php echo $this->Paginator->sort('value');?></th>
 			<th<?php echo ' title="' . $attrDescriptions['signature']['desc'] . '"';?>>
-			<?php echo $this->Paginator->sort('signature');?></th>
+			<?php echo $this->Paginator->sort('IOC');?></th>
 			<th class="actions">Actions</th>
 	</tr>
 	<?php
diff --git a/app/View/Elements/img.ctp b/app/View/Elements/img.ctp
index c073637c2..b741bcf79 100644
--- a/app/View/Elements/img.ctp
+++ b/app/View/Elements/img.ctp
@@ -10,12 +10,11 @@
  */
 
 $imgId = h($id);
-$imgRelativePath = 'orgs' . DS . $imgId . '.png';
+$imgRelativePath = 'orgs/' . $imgId . '.png';
 $imgAbsolutePath = APP . WEBROOT_DIR . DS . 'img' . DS . $imgRelativePath;
 $imgExtraOptions = array('style' => 'float:right;');
-
 if (file_exists($imgAbsolutePath)) {
-	echo $this->Html->image($imgRelativePath, Set::merge(array('alt' => $imgId,'width' => '48', 'hight' => '48'), $imgExtraOptions));
+	echo $this->Html->image($imgRelativePath, Set::merge(array('alt' => $imgId,'width' => '48', 'height' => '48'), $imgExtraOptions));
 } else {
 	echo $this->Html->tag('span', $imgId, Set::merge(array('class' => 'img'), $imgExtraOptions));
 }
\ No newline at end of file
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 607d2ab0b..c9406c459 100755
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -145,7 +145,7 @@ if (!empty($event['Attribute'])):?>
 			<th>Type</th>
 			<th>Value</th>
 			<th>Related Events</th>
-			<th title="<?php echo $attrDescriptions['signature']['desc'];?>">IDS Signature</th>
+			<th title="<?php echo $attrDescriptions['signature']['desc'];?>">IOC</th>
 			<th title="<?php echo $attrDescriptions['private']['desc'];?>">Distribution</th>
 			<th class="actions">Actions</th>
 		</tr><?php