From ef40bdc69152658ea6660787f4c1e4283f7fed5f Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sat, 2 Nov 2013 20:32:28 +0100 Subject: CSS fix avec des colonnes qui font réellement 50% + changement ergo pour ajout/suppr page/media MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/admin/add.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- code/admin/admin.css | 19 ++++++++++++++++--- code/admin/index.php | 26 +++++++++++++++----------- code/admin/utils.php | 4 ++-- 4 files changed, 80 insertions(+), 20 deletions(-) (limited to 'code') diff --git a/code/admin/add.php b/code/admin/add.php index cb2ff16..02622fc 100644 --- a/code/admin/add.php +++ b/code/admin/add.php @@ -2,6 +2,31 @@ require_once('utils.php'); need_auth(); + function add_fold($kind,$path,$name) { + $fullpath=(($kind=='media')?'media/':'content/').$path.'/'.$name; +echo $fullpath . "\n"; + return mkdir($fullpath); + } + + function add_media($path,$name) { + //TODO + } + + function add_page($path,$name) { + if ( $res=add_fold('page',$path,$name) ) { + $props = array( + 'page_template' => 'default', + 'page_layout' => 'article', + 'page_title' => '(missing)', + 'page_description' => '(missing)', + 'page_keywords' => '(missing)' + ); + $ini_path="content/$path/$name/props.ini"; + $res=write_ini_file($props, $ini_path, false); + } + return $res; + } + // Config loading $site_conf = load_ini_site_conf("content/site_conf.ini"); if ( ! is_array($site_conf) ) trigger_error("Error parsing site_conf.ini", E_USER_ERROR); @@ -11,9 +36,26 @@ // URL parameter parsing $kind = sanitize($_GET, 'kind', RE_IDENTIFIER_CLEANER, 'page'); /* Could be : page, media */ + $action=sanitize($_GET, 'action', RE_IDENTIFIER_CLEANER, 'preview'); /* Could be : none, add_fold, add_item */ + $path = sanitize($_GET, 'path', RE_RELPATH_CLEANER, ''); + $name = sanitize($_GET, 'name', RE_IDENTIFIER_CLEANER, ''); // Pre-computed because used twice - $page_title = _('Admin') . ' - ' . ( ($kind=='media')?_('Add a media'):_('Add a page') ); + $page_title = _('Admin') . ' - ' . ( ($kind=='media')?_('Add or remove a media'):_('Add or remove a page') ); + + $res=null; + switch ($action) { + case 'add_fold': + $res=add_fold($kind,$path,$name); + break; + case 'add_item': + if ( $kind=='media' ) { + $res=add_media($path,$name); + } else { + $res=add_page($path,$name); + } + break; + } ?> @@ -28,6 +70,7 @@

+
@@ -41,20 +84,20 @@ ?>
- +

- +
- + diff --git a/code/admin/admin.css b/code/admin/admin.css index f394ef9..6561044 100644 --- a/code/admin/admin.css +++ b/code/admin/admin.css @@ -3,17 +3,30 @@ h1 { font-size:160% } -fieldset { +form { + text-align:center; /* For inner inline blocks */ +} + +span.inline_half { + margin: 0; + padding: 0; display:inline-block; vertical-align: top; - margin: 0.5em; - width:45%; + width:50%; + min-width:28em; + text-align:left; /* Clear parent trick */ +} + +fieldset { + margin: 0 0.5em 0.5em 0.5em; } + fieldset>label { display:inline-block; text-align:right; width: 12em; } + .tree_add { display:block; float:right; diff --git a/code/admin/index.php b/code/admin/index.php index dc10206..8cf1b39 100644 --- a/code/admin/index.php +++ b/code/admin/index.php @@ -26,9 +26,10 @@

+
- +
- +
@@ -45,7 +46,8 @@ - + +

@@ -61,10 +63,10 @@
- +
- +
- +

- - +
@@ -97,7 +99,7 @@
- +
@@ -109,7 +111,9 @@
- + + +
diff --git a/code/admin/utils.php b/code/admin/utils.php index 9612535..4db2d2d 100644 --- a/code/admin/utils.php +++ b/code/admin/utils.php @@ -77,8 +77,8 @@ function is_ress($kind, $path) { switch ($kind) { - case 'page': return is_file($path.'/props.ini'); - case 'media': return substr($path, -4)=='.jpg' && is_file($path); + case 'page': return ( is_dir($path) && is_file($path.'/props.ini') ); + case 'media': return ( substr($path, -4)=='.jpg' && is_file($path) ); default : return FALSE; } } -- cgit v1.2.3