aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Views/Printers
diff options
context:
space:
mode:
Diffstat (limited to 'h-source/Application/Views/Printers')
-rw-r--r--h-source/Application/Views/Printers/catalogue.php12
-rw-r--r--h-source/Application/Views/Printers/form.php8
-rw-r--r--h-source/Application/Views/Printers/page.php2
3 files changed, 8 insertions, 14 deletions
diff --git a/h-source/Application/Views/Printers/catalogue.php b/h-source/Application/Views/Printers/catalogue.php
index 3a166dd..7e42862 100644
--- a/h-source/Application/Views/Printers/catalogue.php
+++ b/h-source/Application/Views/Printers/catalogue.php
@@ -25,11 +25,11 @@
<?php echo $popup;?>
</div>
<div class="viewall_popup_menu_status">
- <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['vendor']?></div>
- <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
- <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
- <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
- <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor']);?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility'];?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year'];?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface'];?></div>
+ <div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by'];?></div>
</div>
</div>
@@ -50,7 +50,7 @@
<div class="notebook_vendor">
<div class="inner_label"><?php echo gtext("vendor");?>:</div>
- <div class="inner_value"><?php echo $item['hardware']['vendor'];?></div>
+ <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div>
</div>
<div class="notebook_vendor">
diff --git a/h-source/Application/Views/Printers/form.php b/h-source/Application/Views/Printers/form.php
index aafb747..2ccfb38 100644
--- a/h-source/Application/Views/Printers/form.php
+++ b/h-source/Application/Views/Printers/form.php
@@ -38,13 +38,7 @@
<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST">
<div class="edit_form">
-
- <div class="form_entry">
- <div class="entry_label"><?php echo gtext("vendor");?>:</div>
- <?php echo Html_Form::select('vendor',$values['vendor'],Printer::$vendors,"select_entry");?>
- <a href="<?php echo $this->baseUrl."/issues/viewall/$lang/1/$token";?>">Vendor not present?</a>
- </div>
-
+
<div class="form_entry">
<div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div>
<?php echo Html_Form::input('model',$values['model'],'input_entry');?>
diff --git a/h-source/Application/Views/Printers/page.php b/h-source/Application/Views/Printers/page.php
index 8e3d463..c33b1d3 100644
--- a/h-source/Application/Views/Printers/page.php
+++ b/h-source/Application/Views/Printers/page.php
@@ -45,7 +45,7 @@
<div class="notebook_vendor">
<div class="inner_label"><?php echo gtext("vendor");?>:</div>
- <div class="inner_value"><b><?php echo $item[$tableName]['vendor'];?></b></div>
+ <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div>
</div>
<div class="notebook_vendor">