[Piwik-svn] r283 - in trunk: plugins/Home/templates themes/default
svnmaster at piwik.org
svnmaster at piwik.org
Mon Feb 4 04:52:38 CET 2008
Author: matt
Date: 2008-02-04 04:52:38 +0100 (Mon, 04 Feb 2008)
New Revision: 283
Modified:
trunk/plugins/Home/templates/datatable.css
trunk/plugins/Home/templates/datatable_actions.tpl
trunk/plugins/Home/templates/datatable_actions_recursive.tpl
trunk/plugins/Home/templates/index.tpl
trunk/themes/default/common.js
Log:
- porting modifs to all datatable_actions tpl
Modified: trunk/plugins/Home/templates/datatable.css
===================================================================
--- trunk/plugins/Home/templates/datatable.css 2008-02-04 03:34:58 UTC (rev 282)
+++ trunk/plugins/Home/templates/datatable.css 2008-02-04 03:52:38 UTC (rev 283)
@@ -81,6 +81,7 @@
table.dataTable td.label {
border-top: 0;
+ border-left:1px solid #C1DAD7;
}
table.dataTable td.labelodd {
@@ -248,3 +249,47 @@
opacity: 0.85;
font-size: 0.7em;
}
+
+
+/* Actions table */
+
+table.dataTableActions tr td.labelodd {
+ background-image:none;
+}
+
+/* levels higher than 4 have a default padding left */
+tr.subActionsDataTable td.label, tr.actionsDataTable td.label{
+ padding-left:7em;
+}
+tr.level0 td.label{
+ padding-left:+1.5em;
+}
+tr.level1 td.label{
+ padding-left:+3.5em;
+}
+tr.level2 td.label{
+ padding-left:+5.5em;
+}
+tr.level3 td.label{
+ padding-left:+6.5em;
+}
+tr.level4 td.label{
+ padding-left:+7em;
+}
+
+tr td.label img.plusMinus {
+ margin-left:-1em;
+ position:absolute;
+}
+
+
+
+/* graph form containing embed code */
+.formEmbedCode, .formEmbedCode input, .formEmbedCode a {
+ font-size: 11px;
+ text-decoration : none;
+}
+.formEmbedCode input {
+ background-color: #FBFDFF;
+ border: 1px solid #ECECEC;
+}
Modified: trunk/plugins/Home/templates/datatable_actions.tpl
===================================================================
--- trunk/plugins/Home/templates/datatable_actions.tpl 2008-02-04 03:34:58 UTC (rev 282)
+++ trunk/plugins/Home/templates/datatable_actions.tpl 2008-02-04 03:52:38 UTC (rev 283)
@@ -5,7 +5,7 @@
{if count($arrayDataTable) == 0}
No data for this table.
{else}
- <table class="dataTable">
+ <table class="dataTable dataTableActions">
<thead>
<tr>
{foreach from=$dataTableColumns item=column}
@@ -16,7 +16,7 @@
<tbody>
{foreach from=$arrayDataTable item=row}
- <tr {if $row.idsubdatatable}class="rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else} class="rowToProcess"{/if}>
+ <tr {if $row.idsubdatatable}class="rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else} class="actionsDataTable rowToProcess"{/if}>
{foreach from=$dataTableColumns key=idColumn item=column}
<td>
{$row.columns[$column.name]}
Modified: trunk/plugins/Home/templates/datatable_actions_recursive.tpl
===================================================================
--- trunk/plugins/Home/templates/datatable_actions_recursive.tpl 2008-02-04 03:34:58 UTC (rev 282)
+++ trunk/plugins/Home/templates/datatable_actions_recursive.tpl 2008-02-04 03:52:38 UTC (rev 283)
@@ -5,7 +5,7 @@
{if count($arrayDataTable) == 0}
No data for this table.
{else}
- <table class="dataTable">
+ <table class="dataTable dataTableActions">
<thead>
<tr>
{foreach from=$dataTableColumns item=column}
@@ -16,7 +16,7 @@
<tbody>
{foreach from=$arrayDataTable item=row}
- <tr {if $row.idsubdatatable}class="level{$row.level} rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else}class="rowToProcess level{$row.level}"{/if}>
+ <tr {if $row.idsubdatatable}class="level{$row.level} rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else}class="actionsDataTable rowToProcess level{$row.level}"{/if}>
{foreach from=$dataTableColumns key=idColumn item=column}
<td>
{if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if}
Modified: trunk/plugins/Home/templates/index.tpl
===================================================================
--- trunk/plugins/Home/templates/index.tpl 2008-02-04 03:34:58 UTC (rev 282)
+++ trunk/plugins/Home/templates/index.tpl 2008-02-04 03:52:38 UTC (rev 283)
@@ -97,6 +97,19 @@
font-family: Georgia,"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
font-size:1em;
}
+
+#h1, #h1 a {
+ color: #006;
+ font-size: 45px;
+ font-weight: lighter;
+ text-decoration : none;
+}
+
+#subh1 {
+ color: #879DBD;
+ font-size: 25px;
+ font-weight: lighter;
+}
h1 {
font-size:2em;
color:#0F1B2E;
@@ -129,32 +142,6 @@
margin-left:30%;
}
-/* Actions table */
-/* levels higher than 4 have a default padding left */
-tr.subActionsDataTable td.label, tr.actionsDataTable td.label{
- padding-left:7em;
-}
-tr.level0 td.label{
- padding-left:+1.5em;
-}
-tr.level1 td.label{
- padding-left:+3.5em;
-}
-tr.level2 td.label{
- padding-left:+5.5em;
-}
-tr.level3 td.label{
- padding-left:+6.5em;
-}
-tr.level4 td.label{
- padding-left:+7em;
-}
-
-tr td.label img.plusMinus {
- margin-left:-1em;
- position:absolute;
-}
-
#miscLinks{
font-size:small;
padding-right:20px;
@@ -171,19 +158,7 @@
}
-#h1, #h1 a {
- color: #006;
- font-size: 45px;
- font-weight: lighter;
- text-decoration : none;
-}
-#subh1 {
- color: #879DBD;
- font-size: 25px;
- font-weight: lighter;
-}
-
#messageToUsers, #messageToUsers a {
color:red;
font-size:0.9em;
@@ -191,14 +166,6 @@
width:100%;
}
-.formEmbedCode, .formEmbedCode input, .formEmbedCode a {
- font-size: 11px;
- text-decoration : none;
-}
-.formEmbedCode input {
- background-color: #FBFDFF;
- border: 1px solid #ECECEC;
-}
.sparkline {
vertical-align: middle;
padding-right:10px;
@@ -237,21 +204,7 @@
</style>
{/literal}
-{literal}
-<script type="text/javascript">
-
-function findSWFGraph(name) {
- if (navigator.appName.indexOf("Microsoft")!= -1) {
- return window[name];
- } else {
- return document[name];
- }
-}
-</script>
-{/literal}
-
-
<span id="loggued">
<form action="{url idSite=null}" method="GET" id="siteSelection">
<small>
Modified: trunk/themes/default/common.js
===================================================================
--- trunk/themes/default/common.js 2008-02-04 03:34:58 UTC (rev 282)
+++ trunk/themes/default/common.js 2008-02-04 03:52:38 UTC (rev 283)
@@ -1,3 +1,12 @@
+
+function findSWFGraph(name) {
+ if (navigator.appName.indexOf("Microsoft")!= -1) {
+ return window[name];
+ } else {
+ return document[name];
+ }
+}
+
function ajaxHandleError()
{
$('#loadingError').show();
More information about the Piwik-svn
mailing list