diff options
| -rw-r--r-- | admin/cat_modify.php | 4 | ||||
| -rw-r--r-- | admin/configuration.php | 2 | ||||
| -rw-r--r-- | admin/infos_images.php | 2 | ||||
| -rw-r--r-- | admin/picture_modify.php | 2 | ||||
| -rw-r--r-- | install/config.sql | 2 | ||||
| -rw-r--r-- | language/en_UK.iso-8859-1/common.lang.php | 1 | ||||
| -rw-r--r-- | language/fr_FR.iso-8859-1/common.lang.php | 1 | ||||
| -rw-r--r-- | template/default/admin/configuration.tpl | 10 |
8 files changed, 20 insertions, 4 deletions
diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 47a34fbdc..201592e30 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -142,10 +142,10 @@ $template->assign_vars(array( $uploadable=>'checked="checked"', 'L_EDIT_CONFIRM'=>$lang['editcat_confirm'], - 'L_EDIT_NAME'=>$lang['description'], + 'L_EDIT_NAME'=>$lang['name'], 'L_STORAGE'=>$lang['storage'], 'L_REMOTE_SITE'=>$lang['remote_site'], - 'L_EDIT_COMMENT'=>$lang['comment'], + 'L_EDIT_COMMENT'=>$lang['description'], 'L_EDIT_CAT_OPTIONS'=>$lang['cat_options'], 'L_EDIT_STATUS'=>$lang['conf_access'], 'L_EDIT_STATUS_INFO'=>$lang['cat_access_info'], diff --git a/admin/configuration.php b/admin/configuration.php index 417d6416f..22e331337 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -248,6 +248,8 @@ switch ($page['section']) 'L_CONF_EXPAND_INFO'=>$lang['conf_default_expand_info'], 'L_NB_COMMENTS'=>$lang['show_nb_comments'], 'L_NB_COMMENTS_INFO'=>$lang['conf_show_nb_comments_info'], + 'L_MAXWIDTH'=>$lang['maxwidth'], + 'L_MAXHEIGHT'=>$lang['maxheight'], 'CONF_LANG_SELECT'=>language_select($conf['default_language'], 'default_language'), 'NB_IMAGE_LINE'=>$conf['nb_image_line'], diff --git a/admin/infos_images.php b/admin/infos_images.php index 9a7ab5590..155ea824f 100644 --- a/admin/infos_images.php +++ b/admin/infos_images.php @@ -283,7 +283,7 @@ if (isset($page['cat'])) 'L_INFOS_DETAIL'=>$lang['infoimage_detailed'], 'L_THUMBNAIL'=>$lang['thumbnail'], 'L_INFOS_IMG'=>$lang['infoimage_title'], - 'L_INFOS_COMMENT'=>$lang['comment'], + 'L_INFOS_COMMENT'=>$lang['description'], 'L_INFOS_ASSOCIATE'=>$lang['infoimage_associate'], 'L_SUBMIT'=>$lang['submit'], diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 4ba5f85a9..d43a8aad9 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -196,7 +196,7 @@ $template->assign_vars(array( 'L_AUTHOR'=>$lang['author'], 'L_CREATION_DATE'=>$lang['creation_date'], 'L_KEYWORDS'=>$lang['keywords'], - 'L_COMMENT'=>$lang['comment'], + 'L_COMMENT'=>$lang['description'], 'L_CATEGORIES'=>$lang['categories'], 'L_DISSOCIATE'=>$lang['dissociate'], 'L_INFOIMAGE_ASSOCIATE'=>$lang['infoimage_associate'], diff --git a/install/config.sql b/install/config.sql index 2c8d2594d..62fabe6f6 100644 --- a/install/config.sql +++ b/install/config.sql @@ -4,6 +4,8 @@ INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('prefix_thumbnail INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('mail_webmaster','','webmaster mail'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_language','en_UK.iso-8859-1','Default gallery language'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_template','default','Default gallery style'); +INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxwidth','','maximum width authorized for displaying images'); +INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxheight','','maximum height authorized for the displaying images'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('access','free','access type to your gallery (free|restricted)'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page'); INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_maxfilesize','150','maximum filesize for the uploaded pictures'); diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index 9517887b0..a6711832d 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -43,6 +43,7 @@ $lang['comment'] = 'Comment'; $lang['comments'] = 'Comments'; $lang['picture'] = 'Picture'; $lang['pictures'] = 'Pictures'; +$lang['name'] = 'Name'; $lang['no'] = 'No'; $lang['yes'] = 'Yes'; $lang['date'] = 'Date'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index e45875503..32baa2b45 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -43,6 +43,7 @@ $lang['comment'] = 'Commentaire'; $lang['comments'] = 'Commentaires'; $lang['picture'] = 'Image'; $lang['pictures'] = 'Images'; +$lang['name'] = 'Nom'; $lang['no'] = 'Non'; $lang['yes'] = 'Oui'; $lang['date'] = 'Date'; diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl index 0d90e356b..e53723ab4 100644 --- a/template/default/admin/configuration.tpl +++ b/template/default/admin/configuration.tpl @@ -102,6 +102,16 @@ <td class="row1"><input type="radio" class="radio" name="show_nb_comments" value="true" {default.SHOW_COMMENTS_YES} />{L_YES} <input type="radio" class="radio" name="show_nb_comments" value="false" {default.SHOW_COMMENTS_NO} />{L_NO}</td> </tr> + <tr> + <td><strong>{default.L_MAXWIDTH} :</strong></td> + <td><input type="text" size="4" maxlength="4" name="default_maxwidth" value="{default.MAXWIDTH}" /> + </td> + </tr> + <tr> + <td><strong>{default.L_MAXHEIGHT} :</strong></td> + <td><input type="text" size="4" maxlength="4" name="default_maxheight" value="{default.MAXHEIGHT}" /> + </td> + </tr> <!-- END default --> <!-- BEGIN upload --> <tr class="admin"> |