- Replace all #content by .content in Sylvia theme.css.
- In LocalFiles Editor, show error message when creating new template file with empty filename. git-svn-id: http://piwigo.org/svn/trunk@2906 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
8a4f579994
commit
ac56adb8b1
7 changed files with 21 additions and 12 deletions
|
|
@ -93,6 +93,10 @@ if ((isset($_POST['edit'])) and !is_numeric($_POST['file_to_edit']))
|
|||
if (isset($_POST['create_tpl']))
|
||||
{
|
||||
$filename = $_POST['tpl_name'];
|
||||
if (empty($filename))
|
||||
{
|
||||
array_push($page['errors'], l10n('locfiledit_empty_filename'));
|
||||
}
|
||||
if (get_extension($filename) != 'tpl')
|
||||
{
|
||||
$filename .= '.tpl';
|
||||
|
|
@ -100,19 +104,20 @@ if (isset($_POST['create_tpl']))
|
|||
if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $filename))
|
||||
{
|
||||
array_push($page['errors'], l10n('locfiledit_filename_error'));
|
||||
$newfile_page = true;
|
||||
}
|
||||
if (is_numeric($_POST['tpl_model']) and $_POST['tpl_model'] != '0')
|
||||
{
|
||||
array_push($page['errors'], l10n('locfiledit_model_error'));
|
||||
$newfile_page = true;
|
||||
}
|
||||
if (file_exists($_POST['tpl_parent'] . '/' . $filename))
|
||||
{
|
||||
array_push($page['errors'], l10n('locfiledit_file_already_exists'));
|
||||
}
|
||||
if (!empty($page['errors']))
|
||||
{
|
||||
$newfile_page = true;
|
||||
}
|
||||
if (!$newfile_page)
|
||||
else
|
||||
{
|
||||
$edited_file = $_POST['tpl_parent'] . '/' . $filename;
|
||||
$content_file = ($_POST['tpl_model'] == '0') ? $new_file['tpl'] : file_get_contents($_POST['tpl_model']);
|
||||
|
|
|
|||
|
|
@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Eltern-Verzeichnis';
|
|||
$lang['locfiledit_filename_error'] = 'Verboten Zeichen in Dateinamen.';
|
||||
$lang['locfiledit_file_already_exists'] = 'Datei ist bereits vorhanden.';
|
||||
$lang['locfiledit_model_error'] = 'Sie müssen ein Modell wählen.';
|
||||
/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.';
|
||||
|
||||
?>
|
||||
|
|
@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Parent directory';
|
|||
$lang['locfiledit_filename_error'] = 'Forbidden caraters in file name.';
|
||||
$lang['locfiledit_file_already_exists'] = 'File already exists.';
|
||||
$lang['locfiledit_model_error'] = 'You must choose a model.';
|
||||
$lang['locfiledit_empty_filename'] = 'You must fill file name.';
|
||||
|
||||
?>
|
||||
|
|
@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Expediente allegado';
|
|||
$lang['locfiledit_filename_error'] = 'Carácteres prohibidos en el nombre del fichero.';
|
||||
$lang['locfiledit_file_already_exists'] = 'El fichero ya existe.';
|
||||
$lang['locfiledit_model_error'] = 'Por favor, seleccione un modelo.';
|
||||
/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.';
|
||||
|
||||
?>
|
||||
|
|
@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Dossier parent';
|
|||
$lang['locfiledit_filename_error'] = 'Caractères interdits dans le nom du fichier.';
|
||||
$lang['locfiledit_file_already_exists'] = 'Le fichier existe déjà.';
|
||||
$lang['locfiledit_model_error'] = 'Veuillez sélectionner un modèle.';
|
||||
$lang['locfiledit_empty_filename'] = 'Veuillez indiquer un nom de fichier.';
|
||||
|
||||
?>
|
||||
|
|
@ -51,5 +51,6 @@ $lang['locfiledit_parent_directory'] = 'Directory parente';
|
|||
$lang['locfiledit_filename_error'] = 'Caratteri vietati nel nome del file.';
|
||||
$lang['locfiledit_file_already_exists'] = 'Il file esiste già.';
|
||||
$lang['locfiledit_model_error'] = 'Selezionare un modello.';
|
||||
/* TODO */ $lang['locfiledit_empty_filename'] = 'You must fill file name.';
|
||||
|
||||
?>
|
||||
|
|
@ -185,7 +185,7 @@ BODY {
|
|||
background:transparent url(images/menuBox_sides.gif) repeat-y scroll left bottom;
|
||||
margin:0;
|
||||
}
|
||||
#content ul.thumbnailCategories li {
|
||||
.content ul.thumbnailCategories li {
|
||||
background:#222 url(images/cat_bottom-right.gif) no-repeat scroll right bottom;
|
||||
width:49%;
|
||||
margin: 0;
|
||||
|
|
@ -196,23 +196,23 @@ BODY {
|
|||
padding: 0;
|
||||
margin:0;
|
||||
}
|
||||
#content .thumbnailCategory div.illustration {
|
||||
.content .thumbnailCategory div.illustration {
|
||||
background:transparent url(images/cat_top-left.gif) no-repeat scroll left top;
|
||||
padding: 0 0 0 10px;
|
||||
margin: 0;
|
||||
margin: 0 !important;
|
||||
}
|
||||
.content .thumbnailCategory div.illustration a {
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding:20px 0 0 8px;
|
||||
}
|
||||
#content .thumbnailCategory div.description {
|
||||
.content .thumbnailCategory div.description {
|
||||
background:transparent url(images/cat_top-right.gif) no-repeat scroll right top;
|
||||
margin: 0;
|
||||
padding:15px 10px 3px 0;
|
||||
overflow: hidden;
|
||||
overflow: hidden !important;
|
||||
}
|
||||
#content .thumbnailCategory div.description .text {
|
||||
.content .thumbnailCategory div.description .text {
|
||||
display:block;
|
||||
margin:10px 2px 0 0;
|
||||
overflow: auto;
|
||||
|
|
@ -223,11 +223,10 @@ BODY {
|
|||
margin: 0 15px 0 15px;
|
||||
text-align: right;
|
||||
}
|
||||
#content.content .thumbnailCategory div.description H3 {
|
||||
.content .thumbnailCategory div.description H3 {
|
||||
display: block;
|
||||
margin: 0;
|
||||
}
|
||||
#content ul.thumbnailCategories li:hover {
|
||||
.content ul.thumbnailCategories li:hover {
|
||||
background-color:#111;
|
||||
}
|
||||
.infos {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue