diff options
Diffstat (limited to 'h-source/Application/Views')
| -rw-r--r-- | h-source/Application/Views/Notebooks/form.php | 11 | ||||
| -rw-r--r-- | h-source/Application/Views/Printers/form.php | 1 | ||||
| -rw-r--r-- | h-source/Application/Views/Scanners/form.php | 1 | ||||
| -rwxr-xr-x | h-source/Application/Views/Users/add.php | 4 | ||||
| -rw-r--r-- | h-source/Application/Views/Videocards/form.php | 1 | ||||
| -rw-r--r-- | h-source/Application/Views/Wifi/form.php | 1 | ||||
| -rw-r--r-- | h-source/Application/Views/noscript_distributions.php | 33 |
7 files changed, 46 insertions, 6 deletions
diff --git a/h-source/Application/Views/Notebooks/form.php b/h-source/Application/Views/Notebooks/form.php index 0ef7d1b..f93eda3 100644 --- a/h-source/Application/Views/Notebooks/form.php +++ b/h-source/Application/Views/Notebooks/form.php @@ -3,19 +3,21 @@ <?php // h-source, a web software to build a community of people that want to share their hardware information. // Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) -// -// This program is free software: you can redistribute it and/or modify +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // -// This program is distributed in the hope that it will be useful, +// h-source is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with h-source. If not, see <http://www.gnu.org/licenses/>. ?> <script> @@ -60,6 +62,7 @@ <div class="form_entry td_with_distribution_checkboxes"> <div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div> + <?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?> <?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?> <?php echo Distributions::getFormHtml();?> </div> diff --git a/h-source/Application/Views/Printers/form.php b/h-source/Application/Views/Printers/form.php index b6a71a6..0b464ff 100644 --- a/h-source/Application/Views/Printers/form.php +++ b/h-source/Application/Views/Printers/form.php @@ -65,6 +65,7 @@ <div class="form_entry td_with_distribution_checkboxes"> <div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div> + <?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?> <?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?> <?php echo Distributions::getFormHtml();?> </div> diff --git a/h-source/Application/Views/Scanners/form.php b/h-source/Application/Views/Scanners/form.php index 78f8bcb..600ba73 100644 --- a/h-source/Application/Views/Scanners/form.php +++ b/h-source/Application/Views/Scanners/form.php @@ -65,6 +65,7 @@ <div class="form_entry td_with_distribution_checkboxes"> <div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div> + <?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?> <?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?> <?php echo Distributions::getFormHtml();?> </div> diff --git a/h-source/Application/Views/Users/add.php b/h-source/Application/Views/Users/add.php index 0b8aabc..2907b28 100755 --- a/h-source/Application/Views/Users/add.php +++ b/h-source/Application/Views/Users/add.php @@ -33,7 +33,7 @@ <form class='formClass' action='<?php echo $this->baseUrl."/users/add/$lang";?>' method='POST'> <div class='formEntry'> - <span class='entryLabel'>choose the username:</span> + <span class='entryLabel'>choose the username (characters allowed: a-z A-Z 0-9):</span> <?php echo Html_Form::input('username',$values['username']);?> </div> @@ -43,7 +43,7 @@ </div> <div class='formEntry'> - <span class='entryLabel'>choose the password:</span> + <span class='entryLabel'>choose the password (characters allowed: a-z A-Z 0-9 - _ !):</span> <?php echo Html_Form::password('password',$values['password']);?> </div> diff --git a/h-source/Application/Views/Videocards/form.php b/h-source/Application/Views/Videocards/form.php index 25f33b7..6752134 100644 --- a/h-source/Application/Views/Videocards/form.php +++ b/h-source/Application/Views/Videocards/form.php @@ -65,6 +65,7 @@ <div class="form_entry td_with_distribution_checkboxes"> <div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div> + <?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?> <?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?> <?php echo Distributions::getFormHtml();?> </div> diff --git a/h-source/Application/Views/Wifi/form.php b/h-source/Application/Views/Wifi/form.php index c955d26..f0315cf 100644 --- a/h-source/Application/Views/Wifi/form.php +++ b/h-source/Application/Views/Wifi/form.php @@ -65,6 +65,7 @@ <div class="form_entry td_with_distribution_checkboxes"> <div class="entry_label"><?php echo gtext("GNU/Linux distribution used for the test");?>: <b>*</b></div> + <?php include(ROOT . DS . APPLICATION_PATH . DS . 'Views' . DS . 'noscript_distributions.php');?> <?php echo Html_Form::input('distribution',$values['distribution'],'input_entry input_distribution');?> <?php echo Distributions::getFormHtml();?> </div> diff --git a/h-source/Application/Views/noscript_distributions.php b/h-source/Application/Views/noscript_distributions.php new file mode 100644 index 0000000..11ae5a6 --- /dev/null +++ b/h-source/Application/Views/noscript_distributions.php @@ -0,0 +1,33 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <noscript> + <div class="noscript_dist_alert"> + <span>Allowed distributions:</span> + <div> + <?php echo Distributions::getList();?> + </div> + <div> + <span><b>Example</b>: blag_90001,gnewsense_3_0,trisquel_4_0</span> + </div> + </div> + </noscript>
\ No newline at end of file |