summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Chevrel <pascal@chevrel.org>2012-03-08 11:29:59 +0100
committerPascal Chevrel <pascal@chevrel.org>2012-03-08 11:29:59 +0100
commitd12ea0a9b75045a1e645fa6b533d5198a4c2328d (patch)
treee45bd83d45a4d3e5bcb91563efae80c2408bfd06
parent41ec00699d5f86cc868984600d3676821caed83f (diff)
downloadplanet-d12ea0a9b75045a1e645fa6b533d5198a4c2328d.tar
planet-d12ea0a9b75045a1e645fa6b533d5198a4c2328d.tar.gz
planet-d12ea0a9b75045a1e645fa6b533d5198a4c2328d.tar.bz2
planet-d12ea0a9b75045a1e645fa6b533d5198a4c2328d.tar.xz
planet-d12ea0a9b75045a1e645fa6b533d5198a4c2328d.zip
change the template in the admin panel to use HTML5 syntax (and use <header> and <nav> elements), adjust css accordingly, add IE6/7/8 support by loading http://html5shiv.googlecode.com/svn/trunk/html5.js with IE conditionnal comments
-rwxr-xr-x[-rw-r--r--]admin/default.css88
-rwxr-xr-x[-rw-r--r--]admin/template.php35
2 files changed, 64 insertions, 59 deletions
diff --git a/admin/default.css b/admin/default.css
index ea2fe59..5c954b0 100644..100755
--- a/admin/default.css
+++ b/admin/default.css
@@ -27,7 +27,7 @@ input.submit{
background: #D1D1D1 url(img/button.png) repeat-x left center;
border: 1px solid #FFF;
border-bottom: 1px solid #CECECE;
- border-right: 1px solid #CECECE;
+ border-right: 1px solid #CECECE;
cursor: pointer;
}
input.submit:hover{
@@ -66,52 +66,52 @@ p.help{
#page{
}
- #header{
+ header{
background: #E0E0E0 url(img/moonmoon.png) no-repeat right center;
border-top: 5px solid #D0D0D0;
margin: 0;
padding: 10px;
}
- #header h1{
+ header h1{
display: none;
margin: 0 0 0 20px;
padding: 0;
height: 14px;
width: 95px;
background: transparent url(img/moonmoon.png) no-repeat left center;
-
+
overflow: hidden;
text-indent: -1000em;
}
- #header p{
+ header p{
margin: 0 0 0 20px;
padding: 0;
}
- #header p a{
+ header p a{
color: #AAA;
}
- #header p a:hover{
+ header p a:hover{
color: #111;
}
-
-
- ul#nav{
+
+
+ nav ul{
margin: 20px 30px;
padding: 0;
list-style: none;
}
- ul#nav:after {content: "."; display: block; height: 0; clear: both; visibility: hidden; }
- ul#nav {display: inline-table;}
+ nav ul:after {content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+ nav ul {display: inline-table;}
/* Hides from IE-mac \*/
- * html ul#nav {height: 1%;}
- ul#nav {display: block;}
+ * html nav ul {height: 1%;}
+ nav ul {display: block;}
/* End hide from IE-mac */
-
- ul#nav li{
+
+ nav ul li{
display: block;
float: left;
}
- ul#nav li a{
+ nav ul li a{
display: block;
border: 1px solid #DDD;
padding: 8px 8px 8px 36px;
@@ -121,7 +121,7 @@ p.help{
background-repeat: no-repeat;
background-position: 6px center;
}
- ul#nav li a:hover,
+ nav ul li a:hover,
body#admin-feed #nav-feed a,
body#admin-admin #nav-admin a {
background-color: #f0f2f6;
@@ -134,11 +134,11 @@ p.help{
#nav-admin a{
background-image: url(img/nav-admin.png);
}
-
+
#content{
margin: 20px 30px;
}
-
+
.widget{
margin: 20px 0;
}
@@ -148,13 +148,15 @@ p.help{
text-transform: uppercase;
margin: 0;
padding: 10px;
+ height: 20px;
+ clear:both;
}
.widget form{
padding: 10px;
border: 1px solid #EEE;
border-top: 0;
}
-
+
#feedmanage p.select{
margin: 3px 0;
}
@@ -195,7 +197,7 @@ p.help{
background: #FFF;
border: 1px solid #4392b7;
}
-
+
#feedmanage tr.selected td{
background: #ffabab;
background: #4392b7;
@@ -209,24 +211,24 @@ p.help{
background: #FFF;
color: #000;
border: 1px solid #4392b7;
- }
-
-/* Login form
-*******************************************************************************/
-form.login {
- width: 400px;
- margin: 0 auto;
-}
-form.login fieldset {
- border: 1px solid #CCC;
- text-align: center;
-}
-
-p.logout {
- float: right;
- margin: 20px 30px 0 0;
-}
- p.logout a {
- padding: 8px;
- display: block;
- } \ No newline at end of file
+ }
+
+/* Login form
+*******************************************************************************/
+form.login {
+ width: 400px;
+ margin: 0 auto;
+}
+form.login fieldset {
+ border: 1px solid #CCC;
+ text-align: center;
+}
+
+p.logout {
+ float: right;
+ margin: 20px 30px 0 0;
+}
+ p.logout a {
+ padding: 8px;
+ display: block;
+ }
diff --git a/admin/template.php b/admin/template.php
index 2c95d5b..6a3c2ea 100644..100755
--- a/admin/template.php
+++ b/admin/template.php
@@ -1,36 +1,39 @@
<?php if(!isset($admin_access)) return; ?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
<head>
- <meta http-equiv="Content-Type" content="text/HTML; charset=UTF-8" />
- <meta http-equiv="Content-Script-Type" content="text/javascript" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta http-equiv="Content-Language" content="en" />
-
+ <meta charset="utf-8">
<title>moonmoon administration</title>
- <link rel="stylesheet" media="screen" type="text/css" href="default.css" />
+ <link rel="stylesheet" media="screen" type="text/css" href="default.css">
+<!--[if lte IE 9]>
+<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+
<?=@$header_extra ?: ''; ?>
+
</head>
<body id="<?=@$page_id ?: ''; ?>">
<div id="page">
- <div id="header">
+ <header>
<h1>moonmoon</h1>
<p><a href="../">Back to main page</a></p>
- </div>
+ </header>
<?php if($admin_access == 1) : ?>
<p class="logout"><a href="logout.php">Logout</a></p>
- <ul id="nav">
- <li id="nav-feed"><a href="index.php">Feeds</a></li>
- <li id="nav-admin"><a href="administration.php">Administration</a></li>
- </ul>
+ <nav>
+ <ul>
+ <li id="nav-feed"><a href="index.php">Feeds</a></li>
+ <li id="nav-admin"><a href="administration.php">Administration</a></li>
+ </ul>
+ </nav>
<?php endif; ?>
+
+
<div id="content">
<?=@$page_content ?: ''; ?>