From de51b631a7cc29c2bb7b1a97c71edf86ba53e58a Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Fri, 13 May 2011 15:14:24 +0000 Subject: h-source:improved the way forms are managed - part 2, improved help pages --- .../Controllers/AcquisitioncardsController.php | 4 + .../Controllers/BluetoothController.php | 4 + .../Controllers/FingerprintreadersController.php | 4 + .../Application/Controllers/PrintersController.php | 4 + .../Application/Controllers/ScannersController.php | 4 + .../Application/Controllers/WebcamsController.php | 4 + .../Application/Views/Acquisitioncards/form.php | 105 ------------------ h-source/Application/Views/Bluetooth/form.php | 105 ------------------ .../Application/Views/Fingerprintreaders/form.php | 105 ------------------ h-source/Application/Views/Help/index.php | 117 +++++++++++++++++++-- h-source/Application/Views/Printers/form.php | 111 ------------------- h-source/Application/Views/Scanners/form.php | 106 ------------------- h-source/Application/Views/Webcams/form.php | 105 ------------------ h-source/Application/Views/form.php | 35 +++++- 14 files changed, 166 insertions(+), 647 deletions(-) delete mode 100644 h-source/Application/Views/Acquisitioncards/form.php delete mode 100644 h-source/Application/Views/Bluetooth/form.php delete mode 100644 h-source/Application/Views/Fingerprintreaders/form.php delete mode 100644 h-source/Application/Views/Printers/form.php delete mode 100644 h-source/Application/Views/Scanners/form.php delete mode 100644 h-source/Application/Views/Webcams/form.php diff --git a/h-source/Application/Controllers/AcquisitioncardsController.php b/h-source/Application/Controllers/AcquisitioncardsController.php index 6979b0e..0a4090a 100644 --- a/h-source/Application/Controllers/AcquisitioncardsController.php +++ b/h-source/Application/Controllers/AcquisitioncardsController.php @@ -97,6 +97,10 @@ class AcquisitioncardsController extends GenericController $this->setArgKeys($argKeys); $data['title'] = 'Acquisition cards'; + + $data['intefaceOptions'] = Acquisitioncards::$interface; + $data['worksOptions'] = Acquisitioncards::$select; + $data['worksField'] = 'compatibility'; $this->append($data); } diff --git a/h-source/Application/Controllers/BluetoothController.php b/h-source/Application/Controllers/BluetoothController.php index 134edff..b452f61 100644 --- a/h-source/Application/Controllers/BluetoothController.php +++ b/h-source/Application/Controllers/BluetoothController.php @@ -97,6 +97,10 @@ class BluetoothController extends GenericController $this->setArgKeys($argKeys); $data['title'] = 'Bluetooth'; + + $data['intefaceOptions'] = Bluetooth::$interface; + $data['worksOptions'] = Bluetooth::$select; + $data['worksField'] = 'bluetooth_works'; $this->append($data); } diff --git a/h-source/Application/Controllers/FingerprintreadersController.php b/h-source/Application/Controllers/FingerprintreadersController.php index a1d264f..6b34fe1 100644 --- a/h-source/Application/Controllers/FingerprintreadersController.php +++ b/h-source/Application/Controllers/FingerprintreadersController.php @@ -97,6 +97,10 @@ class FingerprintreadersController extends GenericController $this->setArgKeys($argKeys); $data['title'] = 'Fingerprint reader'; + + $data['intefaceOptions'] = Fingerprintreaders::$interface; + $data['worksOptions'] = Fingerprintreaders::$select; + $data['worksField'] = 'fingerprint_works'; $this->append($data); } diff --git a/h-source/Application/Controllers/PrintersController.php b/h-source/Application/Controllers/PrintersController.php index 4a0b29e..06a0f93 100644 --- a/h-source/Application/Controllers/PrintersController.php +++ b/h-source/Application/Controllers/PrintersController.php @@ -99,6 +99,10 @@ class PrintersController extends GenericController $this->setArgKeys($argKeys); $data['title'] = 'printers'; + + $data['intefaceOptions'] = Printer::$interface; + $data['worksOptions'] = Printer::$compatibility; + $data['worksField'] = 'compatibility'; $this->append($data); } diff --git a/h-source/Application/Controllers/ScannersController.php b/h-source/Application/Controllers/ScannersController.php index bbdd350..24cd332 100644 --- a/h-source/Application/Controllers/ScannersController.php +++ b/h-source/Application/Controllers/ScannersController.php @@ -97,6 +97,10 @@ class ScannersController extends GenericController $this->setArgKeys($argKeys); $data['title'] = 'scanners'; + + $data['intefaceOptions'] = Printer::$interface; + $data['worksOptions'] = Printer::$compatibility; + $data['worksField'] = 'compatibility'; $this->append($data); } diff --git a/h-source/Application/Controllers/WebcamsController.php b/h-source/Application/Controllers/WebcamsController.php index 6d91eb2..562cc58 100644 --- a/h-source/Application/Controllers/WebcamsController.php +++ b/h-source/Application/Controllers/WebcamsController.php @@ -97,6 +97,10 @@ class WebcamsController extends GenericController $this->setArgKeys($argKeys); $data['title'] = 'Webcam'; + + $data['intefaceOptions'] = Webcams::$interface; + $data['worksOptions'] = Webcams::$select; + $data['worksField'] = 'webcam_works'; $this->append($data); } diff --git a/h-source/Application/Views/Acquisitioncards/form.php b/h-source/Application/Views/Acquisitioncards/form.php deleted file mode 100644 index 2172e6b..0000000 --- a/h-source/Application/Views/Acquisitioncards/form.php +++ /dev/null @@ -1,105 +0,0 @@ - - -. -?> - - - - - -
-
controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST"> - -
- -
-
: *
- -
- -
-
:
model name already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?>
- -
- -
-
: *
">
- -
- -
-
- -
- -
-
()
- -
- -
-
: *
- - - -
- -
-
:
- -
- -
-
- -
- -
-
():
- -
- -
-

">
- -
- - - - - -
- * are mandatory");?> -
- -
- -
-
\ No newline at end of file diff --git a/h-source/Application/Views/Bluetooth/form.php b/h-source/Application/Views/Bluetooth/form.php deleted file mode 100644 index 15c818c..0000000 --- a/h-source/Application/Views/Bluetooth/form.php +++ /dev/null @@ -1,105 +0,0 @@ - - -. -?> - - - - - -
-
controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST"> - -
- -
-
: *
- -
- -
-
:
model name already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?>
- -
- -
-
: *
">
- -
- -
-
- -
- -
-
()
- -
- -
-
: *
- - - -
- -
-
:
- -
- -
-
- -
- -
-
():
- -
- -
-

">
- -
- - - - - -
- * are mandatory");?> -
- -
- -
-
\ No newline at end of file diff --git a/h-source/Application/Views/Fingerprintreaders/form.php b/h-source/Application/Views/Fingerprintreaders/form.php deleted file mode 100644 index 3de6e82..0000000 --- a/h-source/Application/Views/Fingerprintreaders/form.php +++ /dev/null @@ -1,105 +0,0 @@ - - -. -?> - - - - - -
-
controller."/".$this->action."/$lang/$token".$this->viewStatus;?>" method="POST"> - -
- -
-
: *
- -
- -
-
:
model name already inserted inside the above entry. Add the new name in such a way that there is one name per row.");?>
- -
- -
-
: *
">
- -
- -
-
- -
- -
-
()
- -
- -
-
: *
- - - -
- -
-
:
- -
- -
-
- -
- -
-
():
- -
- -
-

">
- -
- - - - - -
- * are mandatory");?> -
- -
- -
-
\ No newline at end of file diff --git a/h-source/Application/Views/Help/index.php b/h-source/Application/Views/Help/index.php index aff2583..735a20e 100644 --- a/h-source/Application/Views/Help/index.php +++ b/h-source/Application/Views/Help/index.php @@ -36,7 +36,7 @@ -

Wiki syntax

 +

Wiki syntax

List of wiki tags

@@ -204,9 +204,9 @@ -

Compatibility classes

 +

Compatibility classes

-

Notebooks

 +

Notebooks

Class A (Platinum)

@@ -229,7 +229,7 @@

The notebook does not work with free software

-

Printers

 +

Printers

Class A (Full)

@@ -244,7 +244,7 @@

The printer does not work with free software

-

Scanners

 +

Scanners

Class A (Full)

@@ -258,7 +258,7 @@

The scanner does not work with free software

-

Discover your hardware

 +

Discover your hardware

(Thanks lluvia)
@@ -268,6 +268,107 @@

How to discover the model name of your notebook

See below your notebook or netbook

+ +

How to discover the model name of your device (if it is not a notebook)

+ +

If the device is integrated (example: a video card)

+ +

Open a terminal and type the following command:

+ + 
+		lspci -vmm
+
+ +

You will obtain the list of your PCI devices, similar to the one written below

+ + 
+		Slot:	03:00.0
+		Class:	Network controller
+		Vendor:	Broadcom Corporation
+		Device:	BCM4311 802.11b/g WLAN
+		SVendor:	Hewlett-Packard Company
+		SDevice:	Device 1375
+		Rev:	02
+
+		Slot:	07:05.0
+		Class:	FireWire (IEEE 1394)
+		Vendor:	Ricoh Co Ltd
+		Device:	R5C832 IEEE 1394 Controller
+		SVendor:	Hewlett-Packard Company
+		SDevice:	Device 30cf
+		Rev:	05
+		ProgIf:	10
+
+ +

The name of each device is written at the "Device" row, after the colon (see the text in bold in the above list)

+ +

You can also write the output of the lspci command to a file by typing:

+ + 
+		lspci -v > filename
+
+ +

where "filename" is the name of the file

+ + +

If the device is an USB device (example: an external USB wifi card)

+ +

Open a terminal and type the following command:

+ + 
+		lsusb -vmm
+
+ +

You will obtain the list of your USB devices, similar to the one written below

+ + 
+		Bus 001 Device 002: ID 0846:4260 NetGear, Inc. WG111v3 54 Mbps Wireless [realtek RTL8187B]
+		Device Descriptor:
+			bLength                18
+			bDescriptorType         1
+			bcdUSB               2.00
+			bDeviceClass            0 (Defined at Interface level)
+			bDeviceSubClass         0
+			bDeviceProtocol         0
+			bMaxPacketSize0        64
+			idVendor           0x0846 NetGear, Inc.
+			idProduct          0x4260 WG111v3 54 Mbps Wireless [realtek RTL8187B]
+			bcdDevice            2.00
+			iManufacturer           1
+			iProduct                2
+			iSerial                 3
+			...
+			...
+
+		Bus 002 Device 003: ID 08ff:2580 AuthenTec, Inc. AES2501 Fingerprint Sensor
+		Device Descriptor:
+			bLength                18
+			bDescriptorType         1
+			bcdUSB               1.10
+			bDeviceClass          255 Vendor Specific Class
+			bDeviceSubClass       255 Vendor Specific Subclass
+			bDeviceProtocol       255 Vendor Specific Protocol
+			bMaxPacketSize0         8
+			idVendor           0x08ff AuthenTec, Inc.
+			idProduct          0x2580 AES2501 Fingerprint Sensor
+			bcdDevice            6.23
+			iManufacturer           0
+			iProduct                1 Fingerprint Sensor
+			iSerial                 0
+			bNumConfigurations      1
+			...
+			...
+
+ +

The name of each device is written at the end of the row starting with "idProduct" (see the text in bold in the above list)

+ +

You can also write the output of the lsusb command to a file by typing:

+ + 
+		lsusb -v > filename
+
+ +

where "filename" is the name of the file

+ "> +
-- cgit v1.2.3