diff options
author | julien <julien@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-18 22:27:54 +0300 |
---|---|---|
committer | julien <julien@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-18 22:27:54 +0300 |
commit | 55d8a3ad0bcb68a5c0da0c0b81c873d3d317b41e (patch) | |
tree | 3582c7885fd2b774d196aa52f4a83e015f5b6cb7 /themes | |
parent | 29a8e2bbb4ba99657395ef51d7adedde77847fc1 (diff) |
Commited some very good patch by Maciej ZawadziĆski :
-fix #106, #112 : Admin index and menu
-fix #88 : nice login screen
-fix #105 : nice plugin admin management,
-fix #40 : outlink/download tracking, solves bugs and adds some options
+Some code cleanup regarding new coding standard
Diffstat (limited to 'themes')
-rw-r--r-- | themes/default/common-admin.css | 205 | ||||
-rw-r--r-- | themes/default/login.tpl | 66 |
2 files changed, 211 insertions, 60 deletions
diff --git a/themes/default/common-admin.css b/themes/default/common-admin.css index 8f2ba5ce92..c1aa8d4e14 100644 --- a/themes/default/common-admin.css +++ b/themes/default/common-admin.css @@ -1,91 +1,180 @@ - * { -font-family:Trebuchet MS,arial,sans-serif; + font-family: Trebuchet MS, arial, sans-serif; } -textarea{ +textarea { font-family: Trebuchet MS, Verdana; - font-size:0.85em; - + font-size: 0.85em; } -#editSites{ - valign:top; +#editSites { + valign: top; } -#access td, #users td -{ +#access td,#users td { spacing: 0px; - padding: 2px 5px 5px 4px; - border: 1px solid #660000; - width:100px; + padding: 2px 5px 5px 4px; + border: 1px solid #660000; + width: 100px; } +#plugins td { + spacing: 0px; + padding: 5px 5px 5px 4px; + border: 1px solid #660000; + width: 100px; +} -#ajaxError{ - color:red; - text-align:center; - font-weight:bold; - width:550px; +#ajaxError { + color: red; + text-align: center; + font-weight: bold; + width: 550px; border: 3px solid red; - margin: 10px; + margin: 10px; padding: 10px; } -#accessUpdated{ - color:red; - text-align:center; - font-weight:bold; - width:350px; - margin: 10px; +#accessUpdated { + color: red; + text-align: center; + font-weight: bold; + width: 350px; + margin: 10px; padding: 10px; - display:none; - border:3px solid green; - color:green; + display: none; + border: 3px solid green; + color: green; } + #addrow img { - vertical-align:middle; + vertical-align: middle; } + #addrow a { - text-decoration:none; + text-decoration: none; +} + +#logo h1 { + font-family: Georgia, "Times New Roman", Times, serif; + font-weight: normal; + color: #136F8B; + font-size: 48px; + text-transform: none; +} + +#logo .description { + font-family: Georgia, "Times New Roman", Times, serif; + font-weight: normal; + color: #879dbd; + font-size: 25px; } table { - font-size:0.9em; - font-family: Arial, Helvetica, verdana sans-serif; - background-color:#fff; - border-collapse: collapse; + font-size: 0.9em; + font-family: Arial, Helvetica, verdana sans-serif; + background-color: #fff; + border-collapse: collapse; } + thead th { - border-right: 1px solid #fff; - color:#fff; - text-align:center; - padding:2px; - text-transform:uppercase; - height:25px; - background-color: #a3c159; - font-weight: normal; + border-right: 1px solid #fff; + color: #fff; + text-align: center; + padding: 2px; + text-transform: uppercase; + height: 25px; + background-color: #a3c159; + font-weight: normal; } + tbody tr { - background-color:#fff; - border-bottom: 1px solid #f0f0f0; + background-color: #fff; + border-bottom: 1px solid #f0f0f0; } + tbody td { - color:#414141; - padding:5px; - text-align:left; + color: #414141; + padding: 5px; + text-align: left; } + tbody th { - text-align:left; - padding:2px; -} -tbody td, tbody th{ - color:#6C8C37; - text-decoration:none; - font-weight:normal; - padding-left:15px; -} -tbody td:hover, tbody th:hover { - color:#009193; - text-decoration:none; + text-align: left; + padding: 2px; +} + +tbody td,tbody th { + color: #6C8C37; + text-decoration: none; + font-weight: normal; + padding-left: 15px; +} + +tbody td:hover,tbody th:hover { + color: #009193; + text-decoration: none; +} + +.activate { + background-color: #fefefe; +} + +.deactivate { + background-color: #ddd; +} + +.activate .switch,.deactivate .switch,.center { + text-align: center; +} + +.activate .switch a,.deactivate .switch a { + padding: 2px; + text-decoration: none; + color: #2f381a; + font-weight: bold; +} + +.activate .switch a:hover { + padding: 2px; + background-color: red; + color: #fff; + text-decoration: none; +} + +.deactivate .switch a:hover { + padding: 2px; + background-color: #666; + color: #fff; + text-decoration: none; +} + +#submit input { + font-size: 2em; + border-top: 2px solid #8cb648; + border-left: 2px solid #8cb648; + border-bottom: 2px solid #4a6026; + border-right: 2px solid #4a6026; + background-color: #6c8c37; + color: #fff; +} + +#submit { + padding-top: 10px; + padding-left: 70px; +} + +.warning { + border: 1px dotted gray; + padding: 15px; + font-size: .8em; +} + +.warning ul { + margin-left: 50px; +} + +.access_error { + font-size: .7em; + padding: 15px; }
\ No newline at end of file diff --git a/themes/default/login.tpl b/themes/default/login.tpl index 3114127992..a8aee64af6 100644 --- a/themes/default/login.tpl +++ b/themes/default/login.tpl @@ -1,5 +1,67 @@ +<link rel="stylesheet" href="themes/default/common-admin.css"> +<div style="width:520px;margin:auto;padding-top:40px;"> + + <div id="logo"> + <h1>Piwik <span class="description"># open source web analytics</span></h1> + + </div> + +<div style="border: 1px solid #ddd;padding:15px;"> + {if $AccessErrorString} -<b>{$AccessErrorString}</b> +<div class="access_error">{$AccessErrorString}</div> +{/if} + +{if $form_data.errors} + <div class="warning"> + <div style="float:left;margin-right:20px;margin-bottom:40px;"><img src="themes/default/images/warning_medium.png"></div> + <div> + <strong>Please fix the following errors:</strong> + <ul> + {foreach from=$form_data.errors item=data} + <li>{$data}</li> + {/foreach} + </ul> + </div> + </div> +{/if} + +{* +{if isset($form_text)} +<p>{$form_text}</p> {/if} +*} + +<form {$form_data.attributes}> +<!-- Output hidden fields --> + +<!-- Display the fields --> +{foreach from=$element_list key=title item=data} + <h3>{$title}</h3> + + <table> + {foreach from=$data item=fieldname} + {* normal form *} + {if $form_data.$fieldname.label} + <tr> + <td>{$form_data.$fieldname.label}</td> + <td>{$form_data.$fieldname.html}</td> + + {elseif $form_data.$fieldname.type == 'hidden'} + {$form_data.$fieldname.html} + {/if}</tr> + {/foreach} + </table> + +{/foreach} + +<div id="submit"> +{$form_data.submit.html} +</div> + +</form> + + +</div> -{include file=genericForm.tpl}
\ No newline at end of file +</div> |