diff options
Diffstat (limited to 'h-source/Application/Views')
30 files changed, 200 insertions, 10 deletions
diff --git a/h-source/Application/Views/Acquisitioncards/catalogue.php b/h-source/Application/Views/Acquisitioncards/catalogue.php index 857fd07..f9d86d7 100644 --- a/h-source/Application/Views/Acquisitioncards/catalogue.php +++ b/h-source/Application/Views/Acquisitioncards/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Acquisitioncards/form.php b/h-source/Application/Views/Acquisitioncards/form.php index cf7668e..2172e6b 100644 --- a/h-source/Application/Views/Acquisitioncards/form.php +++ b/h-source/Application/Views/Acquisitioncards/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Acquisitioncards/page.php b/h-source/Application/Views/Acquisitioncards/page.php index 2a47417..f163be2 100644 --- a/h-source/Application/Views/Acquisitioncards/page.php +++ b/h-source/Application/Views/Acquisitioncards/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Bluetooth/catalogue.php b/h-source/Application/Views/Bluetooth/catalogue.php index 0d5897d..e63f337 100644 --- a/h-source/Application/Views/Bluetooth/catalogue.php +++ b/h-source/Application/Views/Bluetooth/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Bluetooth/form.php b/h-source/Application/Views/Bluetooth/form.php index f6ba115..15c818c 100644 --- a/h-source/Application/Views/Bluetooth/form.php +++ b/h-source/Application/Views/Bluetooth/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Bluetooth/page.php b/h-source/Application/Views/Bluetooth/page.php index 87a0bf0..987a167 100644 --- a/h-source/Application/Views/Bluetooth/page.php +++ b/h-source/Application/Views/Bluetooth/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Fingerprintreaders/catalogue.php b/h-source/Application/Views/Fingerprintreaders/catalogue.php index 3423f60..537caf6 100644 --- a/h-source/Application/Views/Fingerprintreaders/catalogue.php +++ b/h-source/Application/Views/Fingerprintreaders/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Fingerprintreaders/form.php b/h-source/Application/Views/Fingerprintreaders/form.php index a3b6221..3de6e82 100644 --- a/h-source/Application/Views/Fingerprintreaders/form.php +++ b/h-source/Application/Views/Fingerprintreaders/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Fingerprintreaders/page.php b/h-source/Application/Views/Fingerprintreaders/page.php index 1e5f6f0..ac8e800 100644 --- a/h-source/Application/Views/Fingerprintreaders/page.php +++ b/h-source/Application/Views/Fingerprintreaders/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Printers/catalogue.php b/h-source/Application/Views/Printers/catalogue.php index 7e42862..06764cb 100644 --- a/h-source/Application/Views/Printers/catalogue.php +++ b/h-source/Application/Views/Printers/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Printers/form.php b/h-source/Application/Views/Printers/form.php index dd7be91..3ea3e3c 100644 --- a/h-source/Application/Views/Printers/form.php +++ b/h-source/Application/Views/Printers/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("subtype");?> (laser, inkjet, ..):</div> diff --git a/h-source/Application/Views/Printers/page.php b/h-source/Application/Views/Printers/page.php index c33b1d3..5f3c6fd 100644 --- a/h-source/Application/Views/Printers/page.php +++ b/h-source/Application/Views/Printers/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Scanners/catalogue.php b/h-source/Application/Views/Scanners/catalogue.php index aadc463..549c5c9 100644 --- a/h-source/Application/Views/Scanners/catalogue.php +++ b/h-source/Application/Views/Scanners/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Scanners/form.php b/h-source/Application/Views/Scanners/form.php index d666514..bfb5f35 100644 --- a/h-source/Application/Views/Scanners/form.php +++ b/h-source/Application/Views/Scanners/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b> <br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Scanners/page.php b/h-source/Application/Views/Scanners/page.php index 8be06c1..9c86831 100644 --- a/h-source/Application/Views/Scanners/page.php +++ b/h-source/Application/Views/Scanners/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Soundcards/catalogue.php b/h-source/Application/Views/Soundcards/catalogue.php index fd3daab..e4b265b 100644 --- a/h-source/Application/Views/Soundcards/catalogue.php +++ b/h-source/Application/Views/Soundcards/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Soundcards/form.php b/h-source/Application/Views/Soundcards/form.php index 965ecfc..e0d4680 100644 --- a/h-source/Application/Views/Soundcards/form.php +++ b/h-source/Application/Views/Soundcards/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Soundcards/page.php b/h-source/Application/Views/Soundcards/page.php index 75ea7e6..7286bf5 100644 --- a/h-source/Application/Views/Soundcards/page.php +++ b/h-source/Application/Views/Soundcards/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Threegcards/catalogue.php b/h-source/Application/Views/Threegcards/catalogue.php index dc22f8c..a0962e4 100644 --- a/h-source/Application/Views/Threegcards/catalogue.php +++ b/h-source/Application/Views/Threegcards/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Threegcards/form.php b/h-source/Application/Views/Threegcards/form.php index fd80f5a..5928cea 100644 --- a/h-source/Application/Views/Threegcards/form.php +++ b/h-source/Application/Views/Threegcards/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Threegcards/page.php b/h-source/Application/Views/Threegcards/page.php index ef79898..f9328fb 100644 --- a/h-source/Application/Views/Threegcards/page.php +++ b/h-source/Application/Views/Threegcards/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Videocards/catalogue.php b/h-source/Application/Views/Videocards/catalogue.php index bf69cd2..155c30b 100644 --- a/h-source/Application/Views/Videocards/catalogue.php +++ b/h-source/Application/Views/Videocards/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Videocards/form.php b/h-source/Application/Views/Videocards/form.php index 5913882..bf0b1a4 100644 --- a/h-source/Application/Views/Videocards/form.php +++ b/h-source/Application/Views/Videocards/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Videocards/page.php b/h-source/Application/Views/Videocards/page.php index 5dd3db4..c0d5914 100644 --- a/h-source/Application/Views/Videocards/page.php +++ b/h-source/Application/Views/Videocards/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Webcams/catalogue.php b/h-source/Application/Views/Webcams/catalogue.php index 52a33db..5294f46 100644 --- a/h-source/Application/Views/Webcams/catalogue.php +++ b/h-source/Application/Views/Webcams/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Webcams/form.php b/h-source/Application/Views/Webcams/form.php index e1b819c..adf92fe 100644 --- a/h-source/Application/Views/Webcams/form.php +++ b/h-source/Application/Views/Webcams/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Webcams/page.php b/h-source/Application/Views/Webcams/page.php index a13c1db..9cde78f 100644 --- a/h-source/Application/Views/Webcams/page.php +++ b/h-source/Application/Views/Webcams/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> diff --git a/h-source/Application/Views/Wifi/catalogue.php b/h-source/Application/Views/Wifi/catalogue.php index 5e36380..a1bf725 100644 --- a/h-source/Application/Views/Wifi/catalogue.php +++ b/h-source/Application/Views/Wifi/catalogue.php @@ -48,6 +48,13 @@ <img align="top" class="catalogue_item_icon" src="<?php echo Hardware::getIconFromType($item['hardware']['type']);?>"> <span class="span_model_name"><?php echo gtext("model");?>: <b><?php echo $item['hardware']['model'];?></b></span> </div> + <?php if ( strcmp($item['hardware']['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item['hardware']['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><?php echo betterVendor($item['hardware']['vendor']);?></div> diff --git a/h-source/Application/Views/Wifi/form.php b/h-source/Application/Views/Wifi/form.php index 1f31e88..c2adc23 100644 --- a/h-source/Application/Views/Wifi/form.php +++ b/h-source/Application/Views/Wifi/form.php @@ -40,9 +40,14 @@ <div class="edit_form"> <div class="form_entry"> - <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b></div> + <div class="entry_label"><?php echo gtext("model name");?>: <b>*</b><br /><span class="entry_label_small"><?php echo gtext("Write here the model name obtained by the lspci or lsusb command.");?></span> <span class="entry_label_small"><?php echo gtext("This is the name of the chipset of your device.");?></span></div> <?php echo Html_Form::input('model',$values['model'],'input_entry');?> </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("possible other names of the device");?>:<br /><span class="entry_label_small"><?php echo gtext("Add here the device name as written on the device itself or on the device box. Add it only if it is different from the <i>model name</i> already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?></span></div> + <?php echo Html_Form::textarea('other_names',$values['other_names'],'device_textarea_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("VendorID:ProductID code of the device");?>: <b>*</b><br /><a target="blank" href="<?php echo $this->baseUrl."/help/index/$lang#vendoridproductid";?>"><?php echo gtext("learn how to find it");?></a></div> diff --git a/h-source/Application/Views/Wifi/page.php b/h-source/Application/Views/Wifi/page.php index 2e040a6..a172a0c 100644 --- a/h-source/Application/Views/Wifi/page.php +++ b/h-source/Application/Views/Wifi/page.php @@ -43,6 +43,13 @@ <?php } ?> </div> + <?php if ( strcmp($item[$tableName]['other_names'],'') !== 0 ) { ?> + <div class="notebook_vendor"> + <div class="inner_label"><?php echo gtext("possible other names of the device");?>:</div> + <div class="inner_value"><?php echo nl2br($item[$tableName]['other_names']);?></div> + </div> + <?php } ?> + <div class="notebook_vendor"> <div class="inner_label"><?php echo gtext("vendor");?>:</div> <div class="inner_value"><b><?php echo betterVendor($item[$tableName]['vendor']);?></b></div> |