From 7eca3552c8f14a57b59bdb4be4ea8994616467d7 Mon Sep 17 00:00:00 2001 From: nicosomb Date: Fri, 5 Apr 2013 15:30:50 +0200 Subject: [PATCH] mise en page de l'affichage d'un article --- css/index.html | 0 css/reset.css | 35 ------------------- css/style.css | 47 +++++++++++++++++++++++-- css/typography.css | 85 ---------------------------------------------- index.php | 20 ++++++++--- tpl/footer.html | 10 ++---- tpl/index.html | 46 ++++++++++++++++--------- 7 files changed, 93 insertions(+), 150 deletions(-) delete mode 100755 css/index.html delete mode 100755 css/reset.css delete mode 100755 css/typography.css diff --git a/css/index.html b/css/index.html deleted file mode 100755 index e69de29bb..000000000 diff --git a/css/reset.css b/css/reset.css deleted file mode 100755 index 530ddc3df..000000000 --- a/css/reset.css +++ /dev/null @@ -1,35 +0,0 @@ -html, body, div, span, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, code, -del, dfn, em, img, q, dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} - - -/* Tables still need 'cellspacing="0"' in the markup. */ -table { border-collapse: separate; border-spacing: 0; } -caption, th, td { text-align: left; font-weight: normal; } -table, td, th { vertical-align: middle; } - -/* Remove possible quote marks (") from ,
. */ -blockquote:before, blockquote:after, q:before, q:after { content: ""; } -blockquote, q { quotes: "" ""; } - -/* Remove annoying border on linked images. */ -a img { border: none; } - - -body { - - margin: 10px; -} - diff --git a/css/style.css b/css/style.css index 41a617803..764cf6285 100644 --- a/css/style.css +++ b/css/style.css @@ -1,7 +1,11 @@ body { color: #222222; font: 20px/1.3em Palatino,Georgia,serif; - background-color: #e6e6e6; + background-color: #F1F1F1; +} + +body.article { + background-color: #ffffff; } a, a:hover, a:visited { @@ -11,7 +15,20 @@ header { text-align: center; } -#main { +#article header { + text-align: left; + border-bottom: 1px solid #222222; +} + +#article header a { + text-decoration: none; +} + +#article header .vieworiginal a { + color: #888888; +} + +#main, #article { margin: 0 auto; } @@ -26,6 +43,32 @@ header { padding: 15px; } +#main #entries { + margin-top: 20px; +} + +#main #entries .entrie { + color: rgb(46, 46, 46); + position:relative; + background-color: #ffffff; + height: 8em; +} + +#main #entries .entrie h2 a { + text-decoration: none; +} + +#main #entries .entrie h2 a:hover { + color: #F5BE00; +} + +#main #entries .entrie .tools { + position:absolute; + bottom: 0; + width: 100%; + text-align: right; +} + #main a.tool { text-decoration: none; } diff --git a/css/typography.css b/css/typography.css deleted file mode 100755 index e41db096e..000000000 --- a/css/typography.css +++ /dev/null @@ -1,85 +0,0 @@ - -body { - font:1em/1.625em "lucida grande","lucida sans unicode", sans-serif; background-color:#FFFEF0; - font-size-adjust:none; - font-style:normal; - font-variant:normal; - font-weight:normal; - padding: 15px; - margin: 15px auto; -} - -article { - border: 3px solid grey; - max-width:700px; - margin: 15px auto; - padding: 15px; -} - -footer { - border: 1px solid black; - padding: 15px; - margin: 15px auto; -} - -p { padding:0 0 0.8125em 0; color:#111; font-weight:300;} - -p + p { text-indent:1.625em;} - -img { display: block; margin: 0.5em 0.8125em 0.8125em 0; padding: 0; } - -p > img { display: inline-block; margin: 0; } - -h1,h2{ font-weight:normal; color: #333; font-family:Georgia, serif; } -h3,h4,h5,h6 { font-weight: normal; color: #333; font-family:Georgia, serif; } - - -h1 { font-size: 2.125em; margin-bottom: 0.765em; line-height: 1.5em;} -h2 { font-size: 1.9em; margin-bottom: 0.855em; } -h3 { font-size: 1.7em; margin-bottom: 0.956em; } -h4 { font-size: 1.4em; margin-bottom: 1.161em; } -h5,h6 { font-size: 1.313em; margin-bottom: 1.238em; } - - - -ul{list-style-position:outside;} -li ul, -li ol { margin:0 1.625em; } -ul, ol { margin: 0 0 1.625em 0; } - - -dl { margin: 0 0 1.625em 0; } -dl dt { font-weight: bold; } -dl dd { margin-left: 1.625em; } - -a { color:#005AF2; text-decoration:none; } -a:hover { text-decoration: underline; } - - -table { margin-bottom:1.625em; border-collapse: collapse; } -th { font-weight:bold; } -tr,th,td { margin:0; padding:0 1.625em 0 1em; height:26px; } -tfoot { font-style: italic; } -caption { text-align:center; font-family:Georgia, serif; } - - -abbr, acronym { border-bottom:1px dotted #000; } -address { margin-top:1.625em; font-style: italic; } -del {color:#000;} - - -blockquote { padding:1em 1em 1.625em 1em; font-family:georgia,serif;font-style: italic; } -blockquote:before { content:"\201C";font-size:3em;margin-left:-.625em; font-family:georgia,serif;color:#aaa;line-height:0;}/* From Tripoli */ -blockquote > p {padding:0; margin:0; } - -strong { font-weight: bold; } -em, dfn { font-style: italic; } -dfn { font-weight: bold; } -pre, code { margin: 1.625em 0; white-space: pre; } -pre, code, tt { font: 1em monospace; line-height: 1.5; } -tt { display: block; margin: 1.625em 0; } -hr { margin-bottom:1.625em; } - -.oldbook { font-family:"Warnock Pro","Goudy Old Style","Book Antiqua","Palatino",Georgia,serif; } -.note { font-family:Georgia, "Times New Roman", Times, serif; font-style:italic; font-size:0.9em; margin:0.1em; color:#333; } -.mono { font-family:"Courier New", Courier, monospace; } diff --git a/index.php b/index.php index f26654c33..887326d1c 100755 --- a/index.php +++ b/index.php @@ -24,7 +24,7 @@ catch (Exception $e) $action = (isset ($_GET['action'])) ? htmlspecialchars($_GET['action']) : ''; $view = (isset ($_GET['view'])) ? htmlspecialchars($_GET['view']) : ''; -$in = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : ''; +$id = (isset ($_GET['id'])) ? htmlspecialchars($_GET['id']) : ''; switch ($action) { @@ -128,21 +128,31 @@ catch (Exception $e)

logo pochepoche

-
+
- +