diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2009-01-14 06:40:55 +0300 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2009-01-14 06:40:55 +0300 |
| commit | 66ea73f5cecb08df8cac7706c65018bb6719278d (patch) | |
| tree | 3f10980a093701ec7d7b69af024a6dedca08e0fe /plugins | |
| parent | 6ede0280b31adbe673540c5cfb01038392bd8375 (diff) | |
Fixing #452
git-svn-id: http://dev.piwik.org/svn/trunk@870 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins')
79 files changed, 1607 insertions, 1606 deletions
diff --git a/plugins/API/templates/listAllAPI.tpl b/plugins/API/templates/listAllAPI.tpl index 76d2477258..c705023428 100644 --- a/plugins/API/templates/listAllAPI.tpl +++ b/plugins/API/templates/listAllAPI.tpl @@ -22,4 +22,4 @@ {'API_QuickDocumentation'|translate:$token_auth} <span id='token_auth'>token_auth = <b>{$token_auth}</b></span> <p><i>{'API_LoadedAPIs'|translate:$countLoadedAPI}</i></p> -{$list_api_methods_with_links}
\ No newline at end of file +{$list_api_methods_with_links} diff --git a/plugins/CoreAdminHome/templates/footer.tpl b/plugins/CoreAdminHome/templates/footer.tpl index 51f0116ae5..f9ab9402da 100644 --- a/plugins/CoreAdminHome/templates/footer.tpl +++ b/plugins/CoreAdminHome/templates/footer.tpl @@ -1,2 +1,2 @@ -{include file="CoreHome/templates/piwik_tag.tpl"}
\ No newline at end of file +{include file="CoreHome/templates/piwik_tag.tpl"} diff --git a/plugins/CoreAdminHome/templates/header.tpl b/plugins/CoreAdminHome/templates/header.tpl index 55762dccb3..e1f38bf4c4 100644 --- a/plugins/CoreAdminHome/templates/header.tpl +++ b/plugins/CoreAdminHome/templates/header.tpl @@ -36,4 +36,4 @@ <br clear="all"/> -<div id="content">
\ No newline at end of file +<div id="content"> diff --git a/plugins/CoreAdminHome/templates/index.tpl b/plugins/CoreAdminHome/templates/index.tpl index 846d0ea7a3..e5ec6f5b78 100644 --- a/plugins/CoreAdminHome/templates/index.tpl +++ b/plugins/CoreAdminHome/templates/index.tpl @@ -1,17 +1,17 @@ -{assign var=showSitesSelection value=false}
-{assign var=showPeriodSelection value=false}
-{include file="CoreAdminHome/templates/header.tpl"}
-{include file="CoreAdminHome/templates/menu.tpl"}
-
-<div style="clear:both;">
-
-<div id='content'>
-{if $content}{$content}{/if}
-</div>
-
-<div id="footer" style="border-top:1px solid gray; margin-top:20px;padding-top:10px;">
-<a href='?module=CoreHome'>{'General_BackToHomepage'|translate}</a>
-
-</div>
-
-{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file +{assign var=showSitesSelection value=false} +{assign var=showPeriodSelection value=false} +{include file="CoreAdminHome/templates/header.tpl"} +{include file="CoreAdminHome/templates/menu.tpl"} + +<div style="clear:both;"> + +<div id='content'> +{if $content}{$content}{/if} +</div> + +<div id="footer" style="border-top:1px solid gray; margin-top:20px;padding-top:10px;"> +<a href='?module=CoreHome'>{'General_BackToHomepage'|translate}</a> + +</div> + +{include file="CoreAdminHome/templates/footer.tpl"} diff --git a/plugins/CoreAdminHome/templates/menu.css b/plugins/CoreAdminHome/templates/menu.css index 312ba8a436..772e5d90eb 100644 --- a/plugins/CoreAdminHome/templates/menu.css +++ b/plugins/CoreAdminHome/templates/menu.css @@ -34,4 +34,4 @@ #tablist li a.current { background: #defdbb; -}
\ No newline at end of file +} diff --git a/plugins/CoreAdminHome/templates/menu.tpl b/plugins/CoreAdminHome/templates/menu.tpl index 9a12b5e75c..0be387ea96 100644 --- a/plugins/CoreAdminHome/templates/menu.tpl +++ b/plugins/CoreAdminHome/templates/menu.tpl @@ -6,4 +6,4 @@ <li><a href='{$url|@urlRewriteWithParameters}'>{$name}</a></li> {/foreach} </ul> -</div>
\ No newline at end of file +</div> diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index 5a3c3577a7..d053a2b222 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -344,4 +344,4 @@ tr td.label img.plusMinus { text-align: center; font-size: 0.9em; font-style: italic; -}
\ No newline at end of file +} diff --git a/plugins/CoreHome/templates/datatable.tpl b/plugins/CoreHome/templates/datatable.tpl index 55291ee9ea..a8c204e478 100644 --- a/plugins/CoreHome/templates/datatable.tpl +++ b/plugins/CoreHome/templates/datatable.tpl @@ -1,42 +1,42 @@ -<div id="{$properties.uniqueId}">
- <div class="{if isset($javascriptVariablesToSet.idSubtable)&& $javascriptVariablesToSet.idSubtable!=0}sub{/if}{if $javascriptVariablesToSet.viewDataTable=='tableAllColumns'}dataTableAllColumnsWrapper{elseif $javascriptVariablesToSet.viewDataTable=='tableGoals'}dataTableAllColumnsWrapper{else}dataTableWrapper{/if}">
- {if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'}
- {$arrayDataTable.message}
- {else}
- {if count($arrayDataTable) == 0}
- <div id="emptyDatatable">{'CoreHome_TableNoData'|translate}</div>
- {else}
- <a name="{$properties.uniqueId}"></a>
- <table cellspacing="0" class="dataTable">
- <thead>
- <tr>
- {foreach from=$dataTableColumns item=column}
- <th class="sortable" id="{$column.name}"><div id="thDIV">{$column.displayName}</div></th>
- {/foreach}
- </tr>
- </thead>
-
- <tbody>
- {foreach from=$arrayDataTable item=row}
- <tr {if $row.idsubdatatable && $javascriptVariablesToSet.controllerActionCalledWhenRequestSubTable != null}class="subDataTable" id="{$row.idsubdatatable}"{/if}>
-{foreach from=$dataTableColumns item=column}
-<td>
-{if !$row.idsubdatatable && $column.name=='label' && isset($row.metadata.url)}<span id="urlLink">{$row.metadata.url}</span>{/if}
-{if $column.name=='label'}{logoHtml metadata=$row.metadata alt=$row.columns.label}{/if}
-{* sometimes all columns are not set in the datatable, we assume the value 0 *}
-{if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if}
-</td>
-{/foreach}
- </tr>
- {/foreach}
- </tbody>
- </table>
- {/if}
-
- {if $properties.show_footer}
- {include file="CoreHome/templates/datatable_footer.tpl"}
- {/if}
- {include file="CoreHome/templates/datatable_js.tpl"}
- {/if}
- </div>
-</div>
+<div id="{$properties.uniqueId}"> + <div class="{if isset($javascriptVariablesToSet.idSubtable)&& $javascriptVariablesToSet.idSubtable!=0}sub{/if}{if $javascriptVariablesToSet.viewDataTable=='tableAllColumns'}dataTableAllColumnsWrapper{elseif $javascriptVariablesToSet.viewDataTable=='tableGoals'}dataTableAllColumnsWrapper{else}dataTableWrapper{/if}"> + {if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'} + {$arrayDataTable.message} + {else} + {if count($arrayDataTable) == 0} + <div id="emptyDatatable">{'CoreHome_TableNoData'|translate}</div> + {else} + <a name="{$properties.uniqueId}"></a> + <table cellspacing="0" class="dataTable"> + <thead> + <tr> + {foreach from=$dataTableColumns item=column} + <th class="sortable" id="{$column.name}"><div id="thDIV">{$column.displayName}</div></th> + {/foreach} + </tr> + </thead> + + <tbody> + {foreach from=$arrayDataTable item=row} + <tr {if $row.idsubdatatable && $javascriptVariablesToSet.controllerActionCalledWhenRequestSubTable != null}class="subDataTable" id="{$row.idsubdatatable}"{/if}> +{foreach from=$dataTableColumns item=column} +<td> +{if !$row.idsubdatatable && $column.name=='label' && isset($row.metadata.url)}<span id="urlLink">{$row.metadata.url}</span>{/if} +{if $column.name=='label'}{logoHtml metadata=$row.metadata alt=$row.columns.label}{/if} +{* sometimes all columns are not set in the datatable, we assume the value 0 *} +{if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if} +</td> +{/foreach} + </tr> + {/foreach} + </tbody> + </table> + {/if} + + {if $properties.show_footer} + {include file="CoreHome/templates/datatable_footer.tpl"} + {/if} + {include file="CoreHome/templates/datatable_js.tpl"} + {/if} + </div> +</div> diff --git a/plugins/CoreHome/templates/datatable_actions.tpl b/plugins/CoreHome/templates/datatable_actions.tpl index c2dbe1868f..a383b20383 100644 --- a/plugins/CoreHome/templates/datatable_actions.tpl +++ b/plugins/CoreHome/templates/datatable_actions.tpl @@ -1,39 +1,39 @@ -<div id="{$properties.uniqueId}">
- <div class="dataTableActionsWrapper">
- {if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'}
- {$arrayDataTable.message}
- {else}
- {if count($arrayDataTable) == 0}
- <div id="emptyDatatable">{'CoreHome_TableNoData'|translate}</div>
- {else}
- <table cellspacing="0" class="dataTable dataTableActions">
- <thead>
- <tr>
- {foreach from=$dataTableColumns item=column}
- <th class="sortable" id="{$column.name}">{$column.displayName}</td>
- {/foreach}
- </tr>
- </thead>
-
- <tbody>
- {foreach from=$arrayDataTable item=row}
- <tr {if $row.idsubdatatable}class="rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else} class="actionsDataTable rowToProcess"{/if}>
- {foreach from=$dataTableColumns item=column}
- <td>
- {* sometimes all columns are not set in the datatable, we assume the value 0 *}
- {if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if}
- </td>
- {/foreach}
- </tr>
- {/foreach}
- </tbody>
- </table>
- {/if}
-
- {if $properties.show_footer}
- {include file="CoreHome/templates/datatable_footer.tpl"}
- {/if}
- {include file="CoreHome/templates/datatable_actions_js.tpl"}
- {/if}
- </div>
-</div>
+<div id="{$properties.uniqueId}"> + <div class="dataTableActionsWrapper"> + {if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'} + {$arrayDataTable.message} + {else} + {if count($arrayDataTable) == 0} + <div id="emptyDatatable">{'CoreHome_TableNoData'|translate}</div> + {else} + <table cellspacing="0" class="dataTable dataTableActions"> + <thead> + <tr> + {foreach from=$dataTableColumns item=column} + <th class="sortable" id="{$column.name}">{$column.displayName}</td> + {/foreach} + </tr> + </thead> + + <tbody> + {foreach from=$arrayDataTable item=row} + <tr {if $row.idsubdatatable}class="rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else} class="actionsDataTable rowToProcess"{/if}> + {foreach from=$dataTableColumns item=column} + <td> + {* sometimes all columns are not set in the datatable, we assume the value 0 *} + {if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if} + </td> + {/foreach} + </tr> + {/foreach} + </tbody> + </table> + {/if} + + {if $properties.show_footer} + {include file="CoreHome/templates/datatable_footer.tpl"} + {/if} + {include file="CoreHome/templates/datatable_actions_js.tpl"} + {/if} + </div> +</div> diff --git a/plugins/CoreHome/templates/datatable_actions_recursive.tpl b/plugins/CoreHome/templates/datatable_actions_recursive.tpl index 01a22255ed..d2f1abc846 100644 --- a/plugins/CoreHome/templates/datatable_actions_recursive.tpl +++ b/plugins/CoreHome/templates/datatable_actions_recursive.tpl @@ -1,37 +1,37 @@ -<div id="{$properties.uniqueId}">
- <div class="dataTableActionsWrapper">
- {if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'}
- {$arrayDataTable.message}
- {else}
- {if count($arrayDataTable) == 0}
- <div id="emptyDatatable">{'CoreHome_TableNoData'|translate}</div>
- {else}
- <table cellspacing="0" class="dataTable dataTableActions">
- <thead>
- <tr>
- {foreach from=$dataTableColumns item=column}
- <th class="sortable" id="{$column.name}">{$column.displayName}</td>
- {/foreach}
- </tr>
- </thead>
-
- <tbody>
- {foreach from=$arrayDataTable item=row}
- <tr {if $row.idsubdatatable}class="level{$row.level} rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else}class="actionsDataTable rowToProcess level{$row.level}"{/if}>
- {foreach from=$dataTableColumns item=column}
- <td>
- {* sometimes all columns are not set in the datatable, we assume the value 0 *}
- {if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if}
- </td>
- {/foreach}
- </tr>
- {/foreach}
- </tbody>
- </table>
- {/if}
-
- {include file="CoreHome/templates/datatable_footer.tpl"}
- {include file="CoreHome/templates/datatable_actions_js.tpl"}
- {/if}
- </div>
-</div>
+<div id="{$properties.uniqueId}"> + <div class="dataTableActionsWrapper"> + {if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'} + {$arrayDataTable.message} + {else} + {if count($arrayDataTable) == 0} + <div id="emptyDatatable">{'CoreHome_TableNoData'|translate}</div> + {else} + <table cellspacing="0" class="dataTable dataTableActions"> + <thead> + <tr> + {foreach from=$dataTableColumns item=column} + <th class="sortable" id="{$column.name}">{$column.displayName}</td> + {/foreach} + </tr> + </thead> + + <tbody> + {foreach from=$arrayDataTable item=row} + <tr {if $row.idsubdatatable}class="level{$row.level} rowToProcess subActionsDataTable" id="{$row.idsubdatatable}"{else}class="actionsDataTable rowToProcess level{$row.level}"{/if}> + {foreach from=$dataTableColumns item=column} + <td> + {* sometimes all columns are not set in the datatable, we assume the value 0 *} + {if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if} + </td> + {/foreach} + </tr> + {/foreach} + </tbody> + </table> + {/if} + + {include file="CoreHome/templates/datatable_footer.tpl"} + {include file="CoreHome/templates/datatable_actions_js.tpl"} + {/if} + </div> +</div> diff --git a/plugins/CoreHome/templates/datatable_actions_subdatable.tpl b/plugins/CoreHome/templates/datatable_actions_subdatable.tpl index 1cfe58edc9..810002dea3 100644 --- a/plugins/CoreHome/templates/datatable_actions_subdatable.tpl +++ b/plugins/CoreHome/templates/datatable_actions_subdatable.tpl @@ -1,19 +1,19 @@ -<tr id="{$properties.uniqueId}"></tr>
-{if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'}
- {$arrayDataTable.message}
-{else}
- {if count($arrayDataTable) == 0}
- <tr><td colspan="{$nbColumns}">{'CoreHome_CategoryNoData'|translate}</td></tr>
- {else}
- {foreach from=$arrayDataTable item=row}
- <tr {if $row.idsubdatatable}class="subActionsDataTable" id="{$row.idsubdatatable}"{else}class="actionsDataTable"{/if}>
- {foreach from=$dataTableColumns item=column}
- <td>
- {* sometimes all columns are not set in the datatable, we assume the value 0 *}
- {if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if}
- </td>
- {/foreach}
- </tr>
- {/foreach}
- {/if}
-{/if}
+<tr id="{$properties.uniqueId}"></tr> +{if isset($arrayDataTable.result) and $arrayDataTable.result == 'error'} + {$arrayDataTable.message} +{else} + {if count($arrayDataTable) == 0} + <tr><td colspan="{$nbColumns}">{'CoreHome_CategoryNoData'|translate}</td></tr> + {else} + {foreach from=$arrayDataTable item=row} + <tr {if $row.idsubdatatable}class="subActionsDataTable" id="{$row.idsubdatatable}"{else}class="actionsDataTable"{/if}> + {foreach from=$dataTableColumns item=column} + <td> + {* sometimes all columns are not set in the datatable, we assume the value 0 *} + {if isset($row.columns[$column.name])}{$row.columns[$column.name]}{else}0{/if} + </td> + {/foreach} + </tr> + {/foreach} + {/if} +{/if} diff --git a/plugins/CoreHome/templates/datatable_footer.tpl b/plugins/CoreHome/templates/datatable_footer.tpl index 1d92fbcad5..ed0c8f21d0 100644 --- a/plugins/CoreHome/templates/datatable_footer.tpl +++ b/plugins/CoreHome/templates/datatable_footer.tpl @@ -1,62 +1,62 @@ -<div id="dataTableFeatures">
-
-{if $properties.show_exclude_low_population}
- <span id="dataTableExcludeLowPopulation"></span>
-{/if}
-
-{if $properties.show_search}
-<span id="dataTableSearchPattern">
- <input id="keyword" type="text" length="15" />
- <input type="submit" value="{'General_Search'|translate}" />
-</span>
-{/if}
-
-{if $properties.show_offset_information}
- <span id="dataTablePages"></span>
- <span id="dataTablePrevious">‹ {'General_Previous'|translate}</span>
- <span id="dataTableNext">{'General_Next'|translate} ›</span>
-{/if}
-
-{if $properties.show_footer_icons}
- <div>
- <span id="dataTableFooterIcons">
- <span id="exportToFormat" style="display:none;padding-left:4px;">
- <img width="16" height="16" src="{$piwikUrl}themes/default/images/export.png" title="{'General_Export'|translate}" />
- <span id="linksExportToFormat" style="display:none;">
- <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="CSV" filter_limit="100">CSV</a> |
- <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="XML" filter_limit="100">XML</a> |
- <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="JSON" filter_limit="100">Json</a> |
- <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="PHP" filter_limit="100">Php</a> |
- <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="RSS" filter_limit="100" date="last10"><img border="0" src="{$piwikUrl}themes/default/images/feed.png"></a>
- </span>
- <a class="viewDataTable" format="cloud"><img width="16" height="16" src="{$piwikUrl}themes/default/images/tagcloud.png" title="{'General_TagCloud'|translate}" /></a>
- <a class="viewDataTable" format="graphVerticalBar"><img width="16" height="16" src="{$piwikUrl}themes/default/images/chart_bar.png" title="{'General_VBarGraph'|translate}" /></a>
- <a class="viewDataTable" format="graphPie"><img width="16" height="16" src="{$piwikUrl}themes/default/images/chart_pie.png" title="{'General_Piechart'|translate}" /></a>
- </span>
- <span id="dataTableFooterIconsShow" style="display:none;padding-left:4px;">
- <img src="{$piwikUrl}plugins/CoreHome/templates/images/more.png" />
- </span>
- {if $properties.show_table_all_columns}
- <span id="tableAllColumnsSwitch" style="display:none;float:right;padding-right:4px;border-right:1px solid #82A1D2;">
- {if $javascriptVariablesToSet.viewDataTable != 'table'}
- <img title="{'General_DisplayNormalTable'|translate}" src="{$piwikUrl}themes/default/images/table.png" />
- {else}
- <img title="{'General_DisplayMoreData'|translate}" src="{$piwikUrl}themes/default/images/table_more.png" />
- {/if}
- </span>
- {/if}
- {if $properties.show_goals}
- <span id="tableGoals" style="display:none;float:right;padding-right:4px;">
- {if $javascriptVariablesToSet.viewDataTable != 'tableGoals'}
- <img title="View Goals" src="{$piwikUrl}themes/default/images/goal.png" />
- {/if}
- </span>
- {/if}
- </span>
- </div>
-{/if}
-
-<span id="loadingDataTable"><img src="{$piwikUrl}themes/default/images/loading-blue.gif" /> {'General_LoadingData'|translate}</span>
-</div>
-
-<div class="dataTableSpacer" />
+<div id="dataTableFeatures"> + +{if $properties.show_exclude_low_population} + <span id="dataTableExcludeLowPopulation"></span> +{/if} + +{if $properties.show_search} +<span id="dataTableSearchPattern"> + <input id="keyword" type="text" length="15" /> + <input type="submit" value="{'General_Search'|translate}" /> +</span> +{/if} + +{if $properties.show_offset_information} + <span id="dataTablePages"></span> + <span id="dataTablePrevious">‹ {'General_Previous'|translate}</span> + <span id="dataTableNext">{'General_Next'|translate} ›</span> +{/if} + +{if $properties.show_footer_icons} + <div> + <span id="dataTableFooterIcons"> + <span id="exportToFormat" style="display:none;padding-left:4px;"> + <img width="16" height="16" src="{$piwikUrl}themes/default/images/export.png" title="{'General_Export'|translate}" /> + <span id="linksExportToFormat" style="display:none;"> + <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="CSV" filter_limit="100">CSV</a> | + <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="XML" filter_limit="100">XML</a> | + <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="JSON" filter_limit="100">Json</a> | + <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="PHP" filter_limit="100">Php</a> | + <a target="_blank" class="exportToFormat" methodToCall="{$properties.apiMethodToRequestDataTable}" format="RSS" filter_limit="100" date="last10"><img border="0" src="{$piwikUrl}themes/default/images/feed.png"></a> + </span> + <a class="viewDataTable" format="cloud"><img width="16" height="16" src="{$piwikUrl}themes/default/images/tagcloud.png" title="{'General_TagCloud'|translate}" /></a> + <a class="viewDataTable" format="graphVerticalBar"><img width="16" height="16" src="{$piwikUrl}themes/default/images/chart_bar.png" title="{'General_VBarGraph'|translate}" /></a> + <a class="viewDataTable" format="graphPie"><img width="16" height="16" src="{$piwikUrl}themes/default/images/chart_pie.png" title="{'General_Piechart'|translate}" /></a> + </span> + <span id="dataTableFooterIconsShow" style="display:none;padding-left:4px;"> + <img src="{$piwikUrl}plugins/CoreHome/templates/images/more.png" /> + </span> + {if $properties.show_table_all_columns} + <span id="tableAllColumnsSwitch" style="display:none;float:right;padding-right:4px;border-right:1px solid #82A1D2;"> + {if $javascriptVariablesToSet.viewDataTable != 'table'} + <img title="{'General_DisplayNormalTable'|translate}" src="{$piwikUrl}themes/default/images/table.png" /> + {else} + <img title="{'General_DisplayMoreData'|translate}" src="{$piwikUrl}themes/default/images/table_more.png" /> + {/if} + </span> + {/if} + {if $properties.show_goals} + <span id="tableGoals" style="display:none;float:right;padding-right:4px;"> + {if $javascriptVariablesToSet.viewDataTable != 'tableGoals'} + <img title="View Goals" src="{$piwikUrl}themes/default/images/goal.png" /> + {/if} + </span> + {/if} + </span> + </div> +{/if} + +<span id="loadingDataTable"><img src="{$piwikUrl}themes/default/images/loading-blue.gif" /> {'General_LoadingData'|translate}</span> +</div> + +<div class="dataTableSpacer" /> diff --git a/plugins/CoreHome/templates/date.js b/plugins/CoreHome/templates/date.js index 957820f659..7ca90166a6 100644 --- a/plugins/CoreHome/templates/date.js +++ b/plugins/CoreHome/templates/date.js @@ -85,4 +85,4 @@ $(document).ready(function(){ .click(function(){ $("#calendar").toggle(); }); -} );
\ No newline at end of file +} ); diff --git a/plugins/CoreHome/templates/graph.tpl b/plugins/CoreHome/templates/graph.tpl index 4e2bd9cda4..097090bc78 100644 --- a/plugins/CoreHome/templates/graph.tpl +++ b/plugins/CoreHome/templates/graph.tpl @@ -1,10 +1,10 @@ -<div id="{$properties.uniqueId}">
- <div class="{if $graphType=='evolution'}dataTableGraphEvolutionWrapper{else}dataTableGraphWrapper{/if}">
- {$jsInvocationTag}
-
- {if $properties.show_footer}
- {include file="CoreHome/templates/datatable_footer.tpl"}
- {include file="CoreHome/templates/datatable_js.tpl"}
- {/if}
- </div>
-</div>
+<div id="{$properties.uniqueId}"> + <div class="{if $graphType=='evolution'}dataTableGraphEvolutionWrapper{else}dataTableGraphWrapper{/if}"> + {$jsInvocationTag} + + {if $properties.show_footer} + {include file="CoreHome/templates/datatable_footer.tpl"} + {include file="CoreHome/templates/datatable_js.tpl"} + {/if} + </div> +</div> diff --git a/plugins/CoreHome/templates/header.tpl b/plugins/CoreHome/templates/header.tpl index e6ff443c25..d88d17ac95 100644 --- a/plugins/CoreHome/templates/header.tpl +++ b/plugins/CoreHome/templates/header.tpl @@ -4,4 +4,4 @@ {include file="CoreHome/templates/period_select.tpl"} {include file="CoreHome/templates/js_disabled_notice.tpl"} </div> -<br />
\ No newline at end of file +<br /> diff --git a/plugins/CoreHome/templates/index.tpl b/plugins/CoreHome/templates/index.tpl index bb0dbae334..c9f16fe742 100644 --- a/plugins/CoreHome/templates/index.tpl +++ b/plugins/CoreHome/templates/index.tpl @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd ">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Piwik › Web Analytics Reports</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Piwik {$piwik_version}" />
-<link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico">
-{loadJavascriptTranslations plugins='CoreHome'}
-{include file="CoreHome/templates/js_css_includes.tpl"}
-</head>
-
-<body>
-{include file="CoreHome/templates/js_global_variables.tpl"}
-
-{assign var=showSitesSelection value=true}
-{include file="CoreHome/templates/top_bar.tpl"}
-{include file="CoreHome/templates/header.tpl"}
-{include file="CoreHome/templates/menu.tpl"}
-<div style='clear:both'></div>
-{include file="CoreHome/templates/loading.tpl"}
-
-<div id='content'>
-{if $content}{$content}{/if}
-</div>
-
-{include file="CoreHome/templates/piwik_tag.tpl"}
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd "> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>Piwik › Web Analytics Reports</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="generator" content="Piwik {$piwik_version}" /> +<link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"> +{loadJavascriptTranslations plugins='CoreHome'} +{include file="CoreHome/templates/js_css_includes.tpl"} +</head> + +<body> +{include file="CoreHome/templates/js_global_variables.tpl"} + +{assign var=showSitesSelection value=true} +{include file="CoreHome/templates/top_bar.tpl"} +{include file="CoreHome/templates/header.tpl"} +{include file="CoreHome/templates/menu.tpl"} +<div style='clear:both'></div> +{include file="CoreHome/templates/loading.tpl"} + +<div id='content'> +{if $content}{$content}{/if} +</div> + +{include file="CoreHome/templates/piwik_tag.tpl"} +</body> +</html> diff --git a/plugins/CoreHome/templates/logo.tpl b/plugins/CoreHome/templates/logo.tpl index ebdc45e3cb..9c50908926 100644 --- a/plugins/CoreHome/templates/logo.tpl +++ b/plugins/CoreHome/templates/logo.tpl @@ -3,4 +3,4 @@ <span style="color: rgb(245, 223, 114);">P</span><span style="color: rgb(241, 175, 108);">i</span><span style="color: rgb(241, 117, 117);">w</span><span style="color: rgb(155, 106, 58);">i</span><span style="color: rgb(107, 50, 11);">k</span> {if $currentModule != 'CoreHome'}<span style="padding-left:1em;font-size: 20pt; letter-spacing: -1pt; color: rgb(107, 50, 11);">› {$currentPluginName}</span>{/if} </a> -</span>
\ No newline at end of file +</span> diff --git a/plugins/CoreHome/templates/menu.css b/plugins/CoreHome/templates/menu.css index 53ed20ee40..199a163020 100644 --- a/plugins/CoreHome/templates/menu.css +++ b/plugins/CoreHome/templates/menu.css @@ -109,4 +109,4 @@ so submenu remains hidden and JS controls when and how it appears*/ .superfish li:hover ul,.superfish li li:hover ul { top: -999em; -}
\ No newline at end of file +} diff --git a/plugins/CoreHome/templates/menu.js b/plugins/CoreHome/templates/menu.js index 665d78b011..5f0603c55f 100644 --- a/plugins/CoreHome/templates/menu.js +++ b/plugins/CoreHome/templates/menu.js @@ -110,4 +110,4 @@ $(document).ready( function(){ piwikMenu = new menu(); piwikMenu.init(); piwikMenu.loadFirstSection(); -});
\ No newline at end of file +}); diff --git a/plugins/CoreHome/templates/period_select.tpl b/plugins/CoreHome/templates/period_select.tpl index 4b2e13a568..42896afc49 100644 --- a/plugins/CoreHome/templates/period_select.tpl +++ b/plugins/CoreHome/templates/period_select.tpl @@ -1,18 +1,18 @@ -{loadJavascriptTranslations plugins='CoreHome'}
-<script type="text/javascript" src="libs/jquery/jquery-calendar.js"></script>
-<script type="text/javascript" src="plugins/CoreHome/templates/calendar.js"></script>
-<script type="text/javascript" src="plugins/CoreHome/templates/date.js"></script>
-
-<span id="periodString">
- <span id="date"><img src='plugins/CoreHome/templates/images/more_date.gif' style="vertical-align:middle" alt="" /> {$prettyDate}</span> -
- <span id="periods">
- <span id="currentPeriod">{$periodsNames.$period}</span>
- <span id="otherPeriods">
- {foreach from=$otherPeriods item=thisPeriod} | <a href='{url period=$thisPeriod}'>{$periodsNames.$thisPeriod}</a>{/foreach}
- </span>
- </span>
- <br/>
- <span id="calendar"></span>
-</span>
-<div style="clear:both"></div>
-
+{loadJavascriptTranslations plugins='CoreHome'} +<script type="text/javascript" src="libs/jquery/jquery-calendar.js"></script> +<script type="text/javascript" src="plugins/CoreHome/templates/calendar.js"></script> +<script type="text/javascript" src="plugins/CoreHome/templates/date.js"></script> + +<span id="periodString"> + <span id="date"><img src='plugins/CoreHome/templates/images/more_date.gif' style="vertical-align:middle" alt="" /> {$prettyDate}</span> - + <span id="periods"> + <span id="currentPeriod">{$periodsNames.$period}</span> + <span id="otherPeriods"> + {foreach from=$otherPeriods item=thisPeriod} | <a href='{url period=$thisPeriod}'>{$periodsNames.$thisPeriod}</a>{/foreach} + </span> + </span> + <br/> + <span id="calendar"></span> +</span> +<div style="clear:both"></div> + diff --git a/plugins/CoreHome/templates/sites_selection.tpl b/plugins/CoreHome/templates/sites_selection.tpl index 94bf5832d4..cb7c2ec88a 100644 --- a/plugins/CoreHome/templates/sites_selection.tpl +++ b/plugins/CoreHome/templates/sites_selection.tpl @@ -26,4 +26,4 @@ $("#sitesSelection").fdd2div({CssClassName:"formDiv"}); });</script> {/literal} -</span>
\ No newline at end of file +</span> diff --git a/plugins/CoreHome/templates/top_bar.tpl b/plugins/CoreHome/templates/top_bar.tpl index 3e941786d1..e176da537d 100644 --- a/plugins/CoreHome/templates/top_bar.tpl +++ b/plugins/CoreHome/templates/top_bar.tpl @@ -1,22 +1,22 @@ -{assignTopBar}
-
-<div id="topLeftBar">
-{foreach from=$topBarElements item=element}
- <span class="topBarElem">{if $element.0 == $currentModule}<b>{else}<a href="{$element.2|@urlRewriteWithParameters}" {if isset($element.3)}{$element.3}{/if}>{/if}{$element.1}{if $element.0 == $currentModule}</b>{else}</a>{/if}</span>
-{/foreach}
-{postEvent name="template_topBar"}
-</div>
-
-<div id="topRightBar">
-<nobr>
-<small>
-{'General_HelloUser'|translate:"<strong>$userLogin</strong>"}
-{if isset($userHasSomeAdminAccess) && $userHasSomeAdminAccess}| <a href='?module=CoreAdminHome'>{'General_Settings'|translate}</a>{/if}
- {if $showSitesSelection}| {include file=CoreHome/templates/sites_selection.tpl}{/if}
-| {if $userLogin == 'anonymous'}<a href='?module=Login'>{'Login_LogIn'|translate}</a>{else}<a href='?module=Login&action=logout'>{'Login_Logout'|translate}</a>{/if}
-</small>
-
-</nobr>
-</div>
-
-<br clear="all" />
\ No newline at end of file +{assignTopBar} + +<div id="topLeftBar"> +{foreach from=$topBarElements item=element} + <span class="topBarElem">{if $element.0 == $currentModule}<b>{else}<a href="{$element.2|@urlRewriteWithParameters}" {if isset($element.3)}{$element.3}{/if}>{/if}{$element.1}{if $element.0 == $currentModule}</b>{else}</a>{/if}</span> +{/foreach} +{postEvent name="template_topBar"} +</div> + +<div id="topRightBar"> +<nobr> +<small> +{'General_HelloUser'|translate:"<strong>$userLogin</strong>"} +{if isset($userHasSomeAdminAccess) && $userHasSomeAdminAccess}| <a href='?module=CoreAdminHome'>{'General_Settings'|translate}</a>{/if} + {if $showSitesSelection}| {include file=CoreHome/templates/sites_selection.tpl}{/if} +| {if $userLogin == 'anonymous'}<a href='?module=Login'>{'Login_LogIn'|translate}</a>{else}<a href='?module=Login&action=logout'>{'Login_Logout'|translate}</a>{/if} +</small> + +</nobr> +</div> + +<br clear="all" /> diff --git a/plugins/CorePluginsAdmin/templates/manage.tpl b/plugins/CorePluginsAdmin/templates/manage.tpl index 05ec6da16c..7b2e73a93b 100644 --- a/plugins/CorePluginsAdmin/templates/manage.tpl +++ b/plugins/CorePluginsAdmin/templates/manage.tpl @@ -1,54 +1,54 @@ -{assign var=showSitesSelection value=false}
-{assign var=showPeriodSelection value=false}
-{include file="CoreAdminHome/templates/header.tpl"}
-{include file="CoreAdminHome/templates/menu.tpl"}
-
-<div style="max-width:980px;">
-
-<h2>{'CorePluginsAdmin_PluginsManagement'|translate}</h2>
-<p>{'CorePluginsAdmin_MainDescription'|translate}</p>
-<table class="adminTable">
- <thead>
- <tr>
- <th>{'CorePluginsAdmin_Plugin'|translate}</th>
- <th class="num">{'CorePluginsAdmin_Version'|translate}</th>
- <th>{'CorePluginsAdmin_Description'|translate}</th>
- <th class="status">{'CorePluginsAdmin_Status'|translate}</th>
- <th class="action-links">{'CorePluginsAdmin_Action'|translate}</th>
- </tr>
- </thead>
- <tbody id="plugins">
- {foreach from=$pluginsName key=name item=plugin}
- {if !$plugin.alwaysActivated}
- <tr class={if $plugin.activated}"active"{else}class="deactivate"{/if}>
- <td class="name">
- {if isset($plugin.info.homepage)}<a title="{'CorePluginsAdmin_PluginHomepage'|translate}" href="{$plugin.info.homepage}">{/if}
- {$name}
- {if isset($plugin.info.homepage)}</a>{/if}
- </td>
- <td class="vers">{$plugin.info.version}</td>
- <td class="desc">
- {$plugin.info.description}
- <cite>By
- {if isset($plugin.info.author_homepage)}<a title="Author Homepage" href="{$plugin.info.author_homepage}">{/if}
- {$plugin.info.author}{if isset($plugin.info.author_homepage)}</a>{/if}.</cite>
- </td>
- <td class="status">
- {if $plugin.alwaysActivated}<span title="{'CorePluginsAdmin_ActivatedHelp'|translate}" class="active">{'CorePluginsAdmin_Active'|translate}</span>
- {elseif $plugin.activated}{'CorePluginsAdmin_Active'|translate}
- {else}{'CorePluginsAdmin_Inactive'|translate}{/if}
- </td>
-
- <td class="togl action-links" {if $plugin.alwaysActivated}title="{'CorePluginsAdmin_ActivatedHelp'|translate}"{/if}>
- {if $plugin.alwaysActivated} <center>-</center>
- {elseif $plugin.activated}<a href=?module=CorePluginsAdmin&action=deactivate&pluginName={$name}>{'CorePluginsAdmin_Deactivate'|translate}</a>
- {else}<a href=?module=CorePluginsAdmin&action=activate&pluginName={$name}>{'CorePluginsAdmin_Activate'|translate}</a>{/if}
- </td>
- </tr>
- {/if}
-{/foreach}
-</tbody>
-</table>
-
-</div>
-{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file +{assign var=showSitesSelection value=false} +{assign var=showPeriodSelection value=false} +{include file="CoreAdminHome/templates/header.tpl"} +{include file="CoreAdminHome/templates/menu.tpl"} + +<div style="max-width:980px;"> + +<h2>{'CorePluginsAdmin_PluginsManagement'|translate}</h2> +<p>{'CorePluginsAdmin_MainDescription'|translate}</p> +<table class="adminTable"> + <thead> + <tr> + <th>{'CorePluginsAdmin_Plugin'|translate}</th> + <th class="num">{'CorePluginsAdmin_Version'|translate}</th> + <th>{'CorePluginsAdmin_Description'|translate}</th> + <th class="status">{'CorePluginsAdmin_Status'|translate}</th> + <th class="action-links">{'CorePluginsAdmin_Action'|translate}</th> + </tr> + </thead> + <tbody id="plugins"> + {foreach from=$pluginsName key=name item=plugin} + {if !$plugin.alwaysActivated} + <tr class={if $plugin.activated}"active"{else}class="deactivate"{/if}> + <td class="name"> + {if isset($plugin.info.homepage)}<a title="{'CorePluginsAdmin_PluginHomepage'|translate}" href="{$plugin.info.homepage}">{/if} + {$name} + {if isset($plugin.info.homepage)}</a>{/if} + </td> + <td class="vers">{$plugin.info.version}</td> + <td class="desc"> + {$plugin.info.description} + <cite>By + {if isset($plugin.info.author_homepage)}<a title="Author Homepage" href="{$plugin.info.author_homepage}">{/if} + {$plugin.info.author}{if isset($plugin.info.author_homepage)}</a>{/if}.</cite> + </td> + <td class="status"> + {if $plugin.alwaysActivated}<span title="{'CorePluginsAdmin_ActivatedHelp'|translate}" class="active">{'CorePluginsAdmin_Active'|translate}</span> + {elseif $plugin.activated}{'CorePluginsAdmin_Active'|translate} + {else}{'CorePluginsAdmin_Inactive'|translate}{/if} + </td> + + <td class="togl action-links" {if $plugin.alwaysActivated}title="{'CorePluginsAdmin_ActivatedHelp'|translate}"{/if}> + {if $plugin.alwaysActivated} <center>-</center> + {elseif $plugin.activated}<a href=?module=CorePluginsAdmin&action=deactivate&pluginName={$name}>{'CorePluginsAdmin_Deactivate'|translate}</a> + {else}<a href=?module=CorePluginsAdmin&action=activate&pluginName={$name}>{'CorePluginsAdmin_Activate'|translate}</a>{/if} + </td> + </tr> + {/if} +{/foreach} +</tbody> +</table> + +</div> +{include file="CoreAdminHome/templates/footer.tpl"} diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index cf6773d7ac..8dab230982 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -104,4 +104,4 @@ class Piwik_CoreUpdater_Controller } } } -}
\ No newline at end of file +} diff --git a/plugins/CoreUpdater/templates/update_welcome.tpl b/plugins/CoreUpdater/templates/update_welcome.tpl index f607b66fb5..53d04240e2 100644 --- a/plugins/CoreUpdater/templates/update_welcome.tpl +++ b/plugins/CoreUpdater/templates/update_welcome.tpl @@ -20,4 +20,4 @@ <input type="submit" class="submit" value="{'CoreUpdater_UpgradePiwik'|translate}"/> </form> -{include file="CoreUpdater/templates/footer.tpl"}
\ No newline at end of file +{include file="CoreUpdater/templates/footer.tpl"} diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index 1b19b90c02..2c0b6832e1 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -35,4 +35,4 @@ class Piwik_DBStats extends Piwik_Plugin Piwik_AddAdminMenu("Database usage", array('module' => 'DBStats', 'action' => 'index')); } } -
\ No newline at end of file + diff --git a/plugins/DBStats/templates/DBStats.tpl b/plugins/DBStats/templates/DBStats.tpl index e82e095683..2a65c22fc7 100644 --- a/plugins/DBStats/templates/DBStats.tpl +++ b/plugins/DBStats/templates/DBStats.tpl @@ -1,43 +1,43 @@ -{assign var=showSitesSelection value=false}
-{assign var=showPeriodSelection value=false}
-{include file="CoreAdminHome/templates/header.tpl"}
-{include file="CoreAdminHome/templates/menu.tpl"}
-<div style="max-width:980px;">
-
-<h2>{'DBStats_DatabaseUsage'|translate}</h2>
-{assign var=totalSize value=$tablesStatus.Total.Total_length}
-<p>{'DBStats_MainDescription'|translate:$totalSize}</p>
-<table class="adminTable">
- <thead>
- <th>{'DBStats_Table'|translate}</th>
- <th>{'DBStats_RowNumber'|translate}</th>
- <th>{'DBStats_DataSize'|translate}</th>
- <th>{'DBStats_IndexSize'|translate}</th>
- <th>{'DBStats_TotalSize'|translate}</th>
- </thead>
- <tbody id="tables">
- {foreach from=$tablesStatus key=index item=table}
- <tr {if $table.Name == 'Total'}class="active" style="font-weight:bold;"{/if}>
- <td>
- {$table.Name}
- </td>
- <td>
- {$table.Rows}
- </td>
- <td>
- {$table.Data_length}b
- </td>
- <td>
- {$table.Index_length}b
- </td>
- <td>
- {$table.Total_length}b
- </td>
- </tr>
- {/foreach}
- </tbody>
-</table>
-
-</div>
-
-{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file +{assign var=showSitesSelection value=false} +{assign var=showPeriodSelection value=false} +{include file="CoreAdminHome/templates/header.tpl"} +{include file="CoreAdminHome/templates/menu.tpl"} +<div style="max-width:980px;"> + +<h2>{'DBStats_DatabaseUsage'|translate}</h2> +{assign var=totalSize value=$tablesStatus.Total.Total_length} +<p>{'DBStats_MainDescription'|translate:$totalSize}</p> +<table class="adminTable"> + <thead> + <th>{'DBStats_Table'|translate}</th> + <th>{'DBStats_RowNumber'|translate}</th> + <th>{'DBStats_DataSize'|translate}</th> + <th>{'DBStats_IndexSize'|translate}</th> + <th>{'DBStats_TotalSize'|translate}</th> + </thead> + <tbody id="tables"> + {foreach from=$tablesStatus key=index item=table} + <tr {if $table.Name == 'Total'}class="active" style="font-weight:bold;"{/if}> + <td> + {$table.Name} + </td> + <td> + {$table.Rows} + </td> + <td> + {$table.Data_length}b + </td> + <td> + {$table.Index_length}b + </td> + <td> + {$table.Total_length}b + </td> + </tr> + {/foreach} + </tbody> +</table> + +</div> + +{include file="CoreAdminHome/templates/footer.tpl"} diff --git a/plugins/Dashboard/templates/dashboard.css b/plugins/Dashboard/templates/dashboard.css index 2a034ba4ab..a13cd6867f 100644 --- a/plugins/Dashboard/templates/dashboard.css +++ b/plugins/Dashboard/templates/dashboard.css @@ -184,4 +184,4 @@ ul#widgetList { #widgetChooser { z-index:100; -}
\ No newline at end of file +} diff --git a/plugins/ExampleAPI/ExampleAPI.php b/plugins/ExampleAPI/ExampleAPI.php index 782e1ac02e..fe32fb9dc4 100644 --- a/plugins/ExampleAPI/ExampleAPI.php +++ b/plugins/ExampleAPI/ExampleAPI.php @@ -11,4 +11,4 @@ class Piwik_ExampleAPI extends Piwik_Plugin 'version' => '0.1', ); } -}
\ No newline at end of file +} diff --git a/plugins/ExampleFeedburner/ExampleFeedburner.php b/plugins/ExampleFeedburner/ExampleFeedburner.php index 498c6ec222..7a50ec59c6 100644 --- a/plugins/ExampleFeedburner/ExampleFeedburner.php +++ b/plugins/ExampleFeedburner/ExampleFeedburner.php @@ -72,4 +72,4 @@ class Piwik_ExampleFeedburner_Controller extends Piwik_Controller ); } } -}
\ No newline at end of file +} diff --git a/plugins/ExampleFeedburner/feedburner.tpl b/plugins/ExampleFeedburner/feedburner.tpl index dd59dd0379..95ea984c98 100644 --- a/plugins/ExampleFeedburner/feedburner.tpl +++ b/plugins/ExampleFeedburner/feedburner.tpl @@ -1,37 +1,37 @@ -
-<script type="text/javascript">
- var idSite = {$idSite};
-
-{literal}
- $(document).ready(function(){
-
- function getName()
- {
- return $("#feedburnerName").val();
- }
- function loadIframe()
- {
- var feedburnerName = getName();
- $("#feedburnerIframe").html(
- '<iframe height=100px frameborder="0" marginheight="10" marginwidth="10" \
- src="http://www.feedburner.com/fb/ticker/api-ticker2.jsp?uris='+feedburnerName+'"></iframe>');
- }
-
- $("#feedburnerSubmit").click( function(){
- var feedburnerName = getName();
- $.get('?module=ExampleFeedburner&action=saveFeedburnerName&idSite='+idSite+'&name='+feedburnerName);
- loadIframe();
-
- });
-
- loadIframe();
-});
-</script>
-{/literal}
-<span id="feedburnerIframe"></span>
-
-<center>
-<input id="feedburnerName" type="text" value="{$feedburnerFeedName}">
-<input id="feedburnerSubmit" type="submit" value="ok">
-</center>
-
+ +<script type="text/javascript"> + var idSite = {$idSite}; + +{literal} + $(document).ready(function(){ + + function getName() + { + return $("#feedburnerName").val(); + } + function loadIframe() + { + var feedburnerName = getName(); + $("#feedburnerIframe").html( + '<iframe height=100px frameborder="0" marginheight="10" marginwidth="10" \ + src="http://www.feedburner.com/fb/ticker/api-ticker2.jsp?uris='+feedburnerName+'"></iframe>'); + } + + $("#feedburnerSubmit").click( function(){ + var feedburnerName = getName(); + $.get('?module=ExampleFeedburner&action=saveFeedburnerName&idSite='+idSite+'&name='+feedburnerName); + loadIframe(); + + }); + + loadIframe(); +}); +</script> +{/literal} +<span id="feedburnerIframe"></span> + +<center> +<input id="feedburnerName" type="text" value="{$feedburnerFeedName}"> +<input id="feedburnerSubmit" type="submit" value="ok"> +</center> + diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/ExampleRssWidget/ExampleRssWidget.php index da3745ce41..43c11691e9 100644 --- a/plugins/ExampleRssWidget/ExampleRssWidget.php +++ b/plugins/ExampleRssWidget/ExampleRssWidget.php @@ -59,4 +59,4 @@ class Piwik_ExampleRssWidget_Controller extends Piwik_Controller echo '</ul></div>'; } -}
\ No newline at end of file +} diff --git a/plugins/ExampleRssWidget/styles.css b/plugins/ExampleRssWidget/styles.css index c0c284c60b..82521c7045 100644 --- a/plugins/ExampleRssWidget/styles.css +++ b/plugins/ExampleRssWidget/styles.css @@ -28,4 +28,4 @@ line-height:1.5em; font-size:11px; color:#333333; -}
\ No newline at end of file +} diff --git a/plugins/Feedback/index.tpl b/plugins/Feedback/index.tpl index 36cc795a6d..62f1d16c2f 100644 --- a/plugins/Feedback/index.tpl +++ b/plugins/Feedback/index.tpl @@ -1,23 +1,24 @@ -{literal}
-<style>
-input, textarea, p {
- font-family: Georgia,"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
- font-size:0.9em;
- padding:0.2em;
-}
-input {
- margin-top:0.8em;
-}
-</style>
-{/literal}
-
-<form method="post" action="?module=Feedback&action=sendFeedback">
-
-<p><strong>your email :</strong>
-<br /><input type="text" name="email" size="40" /></p>
-<p><strong>your feedback:</strong><br/>
-<i>please be precise if you request for a feature or report a bug</i></p>
-<textarea name="body" cols="37" rows="10"></textarea>
-<br/>
-<input type="submit" value="Send feedback" />
-</form>
+{literal} +<style> +input, textarea, p { + font-family: Georgia,"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; + font-size:0.9em; + padding:0.2em; +} +input { + margin-top:0.8em; +} +</style> +{/literal} + +<form method="post" action="?module=Feedback&action=sendFeedback"> + +<p><strong>your email :</strong> +<br /><input type="text" name="email" size="40" /></p> + +<p><strong>your feedback:</strong><br/> +<i>please be precise if you request for a feature or report a bug</i></p> +<textarea name="body" cols="37" rows="10"></textarea> +<br/> +<input type="submit" value="Send feedback" /> +</form> diff --git a/plugins/Feedback/sent.tpl b/plugins/Feedback/sent.tpl index 1b32a9ff47..65495497bf 100644 --- a/plugins/Feedback/sent.tpl +++ b/plugins/Feedback/sent.tpl @@ -1,33 +1,33 @@ -{literal}
-<style>
-body {
- font-family: Georgia,"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
- font-size:0.9em;
- padding:0.2em;
-}
-#error {
- color: red;
- text-align: center;
- border: 2px solid red;
- background-color:#FFFBFB;
- margin: 10px;
- padding: 10px;
-}
-#success {
- color: #38D73B;
- text-align: center;
- border: 2px solid red;
- margin: 10px;
- padding: 10px;
-}
-</style>
-{/literal}
-
-{if isset($ErrorString)}
- <div id="error"><strong>{'General_Error'|translate}:</strong> {$ErrorString}</div>
- <p>Please manually send your message at <a href='mailto:hello@piwik.org'>hello@piwik.org</a></p>
- <p>{$message}</p>
-{else}
- <div id="success">Your message was sent to Piwik.</div>
- <p><strong>Thank you for your helping us making Piwik better!</strong><br /> The Piwik Team</p>
-{/if}
+{literal} +<style> +body { + font-family: Georgia,"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; + font-size:0.9em; + padding:0.2em; +} +#error { + color: red; + text-align: center; + border: 2px solid red; + background-color:#FFFBFB; + margin: 10px; + padding: 10px; +} +#success { + color: #38D73B; + text-align: center; + border: 2px solid red; + margin: 10px; + padding: 10px; +} +</style> +{/literal} + +{if isset($ErrorString)} + <div id="error"><strong>{'General_Error'|translate}:</strong> {$ErrorString}</div> + <p>Please manually send your message at <a href='mailto:hello@piwik.org'>hello@piwik.org</a></p> + <p>{$message}</p> +{else} + <div id="success">Your message was sent to Piwik.</div> + <p><strong>Thank you for your helping us making Piwik better!</strong><br /> The Piwik Team</p> +{/if} diff --git a/plugins/Goals/templates/GoalForm.js b/plugins/Goals/templates/GoalForm.js index 4345bc8958..a3f82154c5 100644 --- a/plugins/Goals/templates/GoalForm.js +++ b/plugins/Goals/templates/GoalForm.js @@ -121,4 +121,4 @@ function getAjaxAddGoal() ajaxRequest.data = parameters; return ajaxRequest; -}
\ No newline at end of file +} diff --git a/plugins/Goals/templates/form_add_goal.tpl b/plugins/Goals/templates/form_add_goal.tpl index 95c4f6d3d9..00629801b8 100644 --- a/plugins/Goals/templates/form_add_goal.tpl +++ b/plugins/Goals/templates/form_add_goal.tpl @@ -64,4 +64,4 @@ color:#9B9B9B; </tr> </table> </form> -</span>
\ No newline at end of file +</span> diff --git a/plugins/Goals/templates/list_goal_edit.tpl b/plugins/Goals/templates/list_goal_edit.tpl index 081497cade..615c9f9174 100644 --- a/plugins/Goals/templates/list_goal_edit.tpl +++ b/plugins/Goals/templates/list_goal_edit.tpl @@ -19,4 +19,4 @@ </tr> {/foreach} </table> -</span>
\ No newline at end of file +</span> diff --git a/plugins/Goals/templates/overview.tpl b/plugins/Goals/templates/overview.tpl index 04bf1af90d..c5e27cb546 100644 --- a/plugins/Goals/templates/overview.tpl +++ b/plugins/Goals/templates/overview.tpl @@ -24,4 +24,4 @@ {include file=Goals/templates/add_edit_goal.tpl} {/if} -{include file="Goals/templates/release_notes.tpl}
\ No newline at end of file +{include file="Goals/templates/release_notes.tpl} diff --git a/plugins/Goals/templates/release_notes.tpl b/plugins/Goals/templates/release_notes.tpl index dce9ec63b2..8e8c73dfa4 100644 --- a/plugins/Goals/templates/release_notes.tpl +++ b/plugins/Goals/templates/release_notes.tpl @@ -17,4 +17,4 @@ Known bugs Give us Feedback! If you find any other bug, or if you have suggestions, please send us a message using the "Give us feedback" link at the top of the Piwik pages. -</pre>
\ No newline at end of file +</pre> diff --git a/plugins/Goals/templates/single_goal.tpl b/plugins/Goals/templates/single_goal.tpl index b605c17490..2cb3ddde27 100644 --- a/plugins/Goals/templates/single_goal.tpl +++ b/plugins/Goals/templates/single_goal.tpl @@ -34,4 +34,4 @@ $(document).ready( function() { ; }); </script> -{/literal}
\ No newline at end of file +{/literal} diff --git a/plugins/Installation/View.php b/plugins/Installation/View.php index ecbcd51aac..cc623d2f45 100644 --- a/plugins/Installation/View.php +++ b/plugins/Installation/View.php @@ -45,4 +45,4 @@ class Piwik_Install_View extends Piwik_View return parent::render(); } -}
\ No newline at end of file +} diff --git a/plugins/Installation/templates/allSteps.tpl b/plugins/Installation/templates/allSteps.tpl index 6bf66d0f9c..5d73449c24 100644 --- a/plugins/Installation/templates/allSteps.tpl +++ b/plugins/Installation/templates/allSteps.tpl @@ -8,4 +8,4 @@ <li class="futureStep">{$stepName}</li> {/if} {/foreach} -</ul>
\ No newline at end of file +</ul> diff --git a/plugins/Installation/templates/databaseSetup.tpl b/plugins/Installation/templates/databaseSetup.tpl index da94a91143..95487358b7 100644 --- a/plugins/Installation/templates/databaseSetup.tpl +++ b/plugins/Installation/templates/databaseSetup.tpl @@ -1,14 +1,14 @@ -<h1>{'Installation_MysqlSetup'|translate}</h1>
-
-{if isset($errorMessage)}
- <div class="error">
- <img src="themes/default/images/error_medium.png">
- {'Installation_MysqlErrorConnect'|translate}:
- <br />{$errorMessage}
-
- </div>
-{/if}
-
-{if isset($form_data)}
- {include file=default/genericForm.tpl}
-{/if}
+<h1>{'Installation_MysqlSetup'|translate}</h1> + +{if isset($errorMessage)} + <div class="error"> + <img src="themes/default/images/error_medium.png"> + {'Installation_MysqlErrorConnect'|translate}: + <br />{$errorMessage} + + </div> +{/if} + +{if isset($form_data)} + {include file=default/genericForm.tpl} +{/if} diff --git a/plugins/Installation/templates/displayJavascriptCode.tpl b/plugins/Installation/templates/displayJavascriptCode.tpl index c030b7a514..1d856ab65d 100644 --- a/plugins/Installation/templates/displayJavascriptCode.tpl +++ b/plugins/Installation/templates/displayJavascriptCode.tpl @@ -1,46 +1,46 @@ -
-{literal}
-<style>
-code {
- background-color:#F0F7FF;
- border-color:#00008B;
- border-style:dashed dashed dashed solid;
- border-width:1px 1px 1px 5px;
- direction:ltr;
- display:block;
- font-size:80%;
- margin:2px 2px 20px;
- padding:4px;
- text-align:left;
-}
-</style>
-
-<script>
-$(document).ready( function(){
- $('code').click( function(){ $(this).select(); });
-});
-</script>
-
-{/literal}
-
-{if isset($displayfirstWebsiteSetupSuccess)}
-
-<span id="toFade" class="success">
- Website {$websiteName} created with success!
- <img src="themes/default/images/success_medium.png">
-</span>
-{/if}
-<h1>{'Installation_JsTag'|translate}</h1>
-{'Installation_JsTagHelp'|translate}
-<code>
-{$javascriptTag}
-</code>
-
-<h1>Quick help:</h1>
-<ul>
-<li>The best is to add the tag just before your </body> at the bottom of your pages</li>
-<li>You can generally edit your website templates and add this code in a "footer" file.</li>
-<li><a target="_blank" href="http://piwik.org/docs/javascript-tracking/">More information about the Javascript Tracking</a>.</li>
-<li>For medium and high traffic websites, check out the <a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">How to setup auto archiving page</a> to make Piwik run really fast!</li>
-<!-- <li>Link to help with the main blog engines wordpress/drupal/myspace/blogspot</li> -->
-</ul>
+ +{literal} +<style> +code { + background-color:#F0F7FF; + border-color:#00008B; + border-style:dashed dashed dashed solid; + border-width:1px 1px 1px 5px; + direction:ltr; + display:block; + font-size:80%; + margin:2px 2px 20px; + padding:4px; + text-align:left; +} +</style> + +<script> +$(document).ready( function(){ + $('code').click( function(){ $(this).select(); }); +}); +</script> + +{/literal} + +{if isset($displayfirstWebsiteSetupSuccess)} + +<span id="toFade" class="success"> + Website {$websiteName} created with success! + <img src="themes/default/images/success_medium.png"> +</span> +{/if} +<h1>{'Installation_JsTag'|translate}</h1> +{'Installation_JsTagHelp'|translate} +<code> +{$javascriptTag} +</code> + +<h1>Quick help:</h1> +<ul> +<li>The best is to add the tag just before your </body> at the bottom of your pages</li> +<li>You can generally edit your website templates and add this code in a "footer" file.</li> +<li><a target="_blank" href="http://piwik.org/docs/javascript-tracking/">More information about the Javascript Tracking</a>.</li> +<li>For medium and high traffic websites, check out the <a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">How to setup auto archiving page</a> to make Piwik run really fast!</li> +<!-- <li>Link to help with the main blog engines wordpress/drupal/myspace/blogspot</li> --> +</ul> diff --git a/plugins/Installation/templates/finished.tpl b/plugins/Installation/templates/finished.tpl index 92fa772f15..4dd50d6820 100644 --- a/plugins/Installation/templates/finished.tpl +++ b/plugins/Installation/templates/finished.tpl @@ -1,8 +1,8 @@ -<h1>{'Installation_Congratulations'|translate}</h1>
-
-{'Installation_CongratulationsHelp'|translate}
-
-
-<p class="nextStep">
- <a href="{url module='' action=''}">{'Installation_ContinueToPiwik'|translate} »</a>
-</p>
+<h1>{'Installation_Congratulations'|translate}</h1> + +{'Installation_CongratulationsHelp'|translate} + + +<p class="nextStep"> + <a href="{url module='' action=''}">{'Installation_ContinueToPiwik'|translate} »</a> +</p> diff --git a/plugins/Installation/templates/firstWebsiteSetup.tpl b/plugins/Installation/templates/firstWebsiteSetup.tpl index 3c0446bc3c..2e97223be7 100644 --- a/plugins/Installation/templates/firstWebsiteSetup.tpl +++ b/plugins/Installation/templates/firstWebsiteSetup.tpl @@ -1,23 +1,23 @@ -
-
-{if isset($displayGeneralSetupSuccess)}
-<span id="toFade" class="success">
- {'Installation_GeneralSetupSuccess'|translate}
- <img src="themes/default/images/success_medium.png">
-</span>
-{/if}
-
-<h1>{'Installation_SetupWebsite'|translate}</h1>
-
-{if isset($errorMessage)}
- <div class="error">
- <img src="themes/default/images/error_medium.png">
- {'Installation_SetupWebsiteError'|translate}:
- <br />- {$errorMessage}
-
- </div>
-{/if}
-
-{if isset($form_data)}
- {include file=default/genericForm.tpl}
-{/if}
+ + +{if isset($displayGeneralSetupSuccess)} +<span id="toFade" class="success"> + {'Installation_GeneralSetupSuccess'|translate} + <img src="themes/default/images/success_medium.png"> +</span> +{/if} + +<h1>{'Installation_SetupWebsite'|translate}</h1> + +{if isset($errorMessage)} + <div class="error"> + <img src="themes/default/images/error_medium.png"> + {'Installation_SetupWebsiteError'|translate}: + <br />- {$errorMessage} + + </div> +{/if} + +{if isset($form_data)} + {include file=default/genericForm.tpl} +{/if} diff --git a/plugins/Installation/templates/generalSetup.tpl b/plugins/Installation/templates/generalSetup.tpl index 221b30261b..869addbf25 100644 --- a/plugins/Installation/templates/generalSetup.tpl +++ b/plugins/Installation/templates/generalSetup.tpl @@ -1,5 +1,5 @@ -<h1>{'Installation_GeneralSetup'|translate}</h1>
-
-{if isset($form_data)}
- {include file=default/genericForm.tpl}
-{/if}
\ No newline at end of file +<h1>{'Installation_GeneralSetup'|translate}</h1> + +{if isset($form_data)} + {include file=default/genericForm.tpl} +{/if} diff --git a/plugins/Installation/templates/structure.tpl b/plugins/Installation/templates/structure.tpl index d4e4309970..55c19990d2 100644 --- a/plugins/Installation/templates/structure.tpl +++ b/plugins/Installation/templates/structure.tpl @@ -1,226 +1,226 @@ -
-<html>
-<head>
-<title>Piwik » {'Installation_Installation'|translate}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-<body>
-
-{literal}
-<script type="text/javascript" src="libs/jquery/jquery.js"></script>
-<script>
-$(document).ready( function(){
- $('#toFade').fadeOut(4000, function(){ $(this).css('display', 'hidden'); } );
- $('input:first').focus();
- });
-</script>
-{/literal}
-
-{literal}
-<style>
-div.both {
- clear: both;
-}
-
-body {
- background-color: #F9F9F9;
- text-align: center;
- font-family:Georgia,"Times New Roman",Times,serif;
- font-size:19px;
-}
-
-#title{
- font-size:50px;
- color:#284F92;
-}
-
-#subtitle{
- font-size:30px;
- color:#C7D8D2;
-}
-
-#logo {
- padding:30;
-}
-
-h1 {
- font-size:20px;
- color:#666666;
- border-bottom:1px solid #DADADA;
- padding:0 0 7px;
-}
-
-h3 {
- margin-top:10px;
- font-size:17px;
- color:#3F5163;
-}
-
-.error {
- color:red;
- font-size:100%;
- font-weight:bold;
- border: 1px solid red;
- width: 550px;
- padding:20;
-}
-.error img {
- border:0;
- float:right;
- margin:10;
-}
-.success {
- color:#26981C;
- font-size:130%;
- font-weight:bold;
- padding:10;
-}
-.warning {
- color:#ff5502;
- font-size:130%;
- font-weight:bold;
- padding:10;
- border: 1px solid #ff5502;
-}
-
-.success img, .warning img {
- border:0;
- vertical-align:bottom;
-}
-
-#detailInstall {
- width:70%;
- float: right;
-}
-
-/* Cadre general */
-#main {
- margin: 5px;
- margin-top:30px;
- text-align: left;
-}
-
-#content {
- font-size: 90%;
- line-height: 1.4em;
- width: 860px;
- border: 1px solid #3B62AF;
- text-align: $rightouleft;
- margin: auto;
- background: #FFFFFF;
- padding: 0.2em 2em 2em 2em;
-
- -moz-border-radius: 8px;
- -khtml-border-radius: 8px;
- -webkit-border-radius: 8px;
-}
-/* form errors */
-#adminErrors {
- color:#FF6E46;
- font-size:120%;
-}
-/* listing all the steps */
-#generalInstall {
- width: 30%;
- float: left;
- font-size:90%;
-}
-
-#generalInstall UL {
- list-style-type: decimal;
-}
-LI.futureStep {
- color: #d3d3d3;
-}
-LI.actualStep {
- font-weight: bold;
-}
-LI.pastStep {
- color: #008000;
-}
-
-P.nextStep A {
- font-weight: bold;
- padding: 0.5em;
- color: #ae0000;
- text-decoration: underline;
- float:right;
- font-size:35px;
-}
-
-#installPercent {
- width: 100%;
- height: 1.5em;
- margin: 0;
- padding: 0;
- background-color: #eee;
- border: 1px solid #ddd;
-}
-#installPercent P {
- height: 1.5em;
- background-color: #8aaecc;
- margin: 0;
- padding: 0;
-}
-
-td {
- border-color:#FFFFFF rgb(198, 205, 216) rgb(198, 205, 216) rgb(198, 205, 216) ;
- border-style:solid;
- border-width:1px;
- color:#203276;
- padding:0.5em 0.5em 0.5em 0.8em;
-}
-
-.submit {
- text-align:center;
-}
-.submit input{
- margin-top:15px;
- background:transparent url(./themes/default/images/background-submit.png) repeat scroll 0%;
- font-size:1.4em;
- border-color:#CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
- border-style:double;
- border-width:3px;
- color:#333333;
- padding:0.15em;
-}
-
-input {
- font-size:1.1em;
- border-color:#CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
- border-width:1px;
- color:#3A2B16;
- padding:0.15em;
-}
-</style>
-{/literal}
-<div id="main">
- <div id="content">
- <div id="logo">
- <span id="title">Piwik</span> <span id="subtitle"># {'General_OpenSourceWebAnalytics'|translate}</span>
- </div>
- <div class="both"></div>
-
- <div id="generalInstall">
- {include file="Installation/templates/allSteps.tpl"}
- </div>
-
- <div id="detailInstall">
- {include file="$subTemplateToLoad"}
- {if $showNextStep}
- <p class="nextStep">
- <a href="{url action=$nextModuleName}">{'General_Next'|translate} »</a>
- </p>
- {/if}
- </div>
-
- <div class="both"></div>
-
- <h3>{'Installation_InstallationStatus'|translate}</h3>
-
- <div id="installPercent">
- <p style="width: {$percentDone}%;"></p>
- </div>
-
- {'Installation_PercentDone'|translate:$percentDone}
-</div>
+ +<html> +<head> +<title>Piwik » {'Installation_Installation'|translate}</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +</head> +<body> + +{literal} +<script type="text/javascript" src="libs/jquery/jquery.js"></script> +<script> +$(document).ready( function(){ + $('#toFade').fadeOut(4000, function(){ $(this).css('display', 'hidden'); } ); + $('input:first').focus(); + }); +</script> +{/literal} + +{literal} +<style> +div.both { + clear: both; +} + +body { + background-color: #F9F9F9; + text-align: center; + font-family:Georgia,"Times New Roman",Times,serif; + font-size:19px; +} + +#title{ + font-size:50px; + color:#284F92; +} + +#subtitle{ + font-size:30px; + color:#C7D8D2; +} + +#logo { + padding:30; +} + +h1 { + font-size:20px; + color:#666666; + border-bottom:1px solid #DADADA; + padding:0 0 7px; +} + +h3 { + margin-top:10px; + font-size:17px; + color:#3F5163; +} + +.error { + color:red; + font-size:100%; + font-weight:bold; + border: 1px solid red; + width: 550px; + padding:20; +} +.error img { + border:0; + float:right; + margin:10; +} +.success { + color:#26981C; + font-size:130%; + font-weight:bold; + padding:10; +} +.warning { + color:#ff5502; + font-size:130%; + font-weight:bold; + padding:10; + border: 1px solid #ff5502; +} + +.success img, .warning img { + border:0; + vertical-align:bottom; +} + +#detailInstall { + width:70%; + float: right; +} + +/* Cadre general */ +#main { + margin: 5px; + margin-top:30px; + text-align: left; +} + +#content { + font-size: 90%; + line-height: 1.4em; + width: 860px; + border: 1px solid #3B62AF; + text-align: $rightouleft; + margin: auto; + background: #FFFFFF; + padding: 0.2em 2em 2em 2em; + + -moz-border-radius: 8px; + -khtml-border-radius: 8px; + -webkit-border-radius: 8px; +} +/* form errors */ +#adminErrors { + color:#FF6E46; + font-size:120%; +} +/* listing all the steps */ +#generalInstall { + width: 30%; + float: left; + font-size:90%; +} + +#generalInstall UL { + list-style-type: decimal; +} +LI.futureStep { + color: #d3d3d3; +} +LI.actualStep { + font-weight: bold; +} +LI.pastStep { + color: #008000; +} + +P.nextStep A { + font-weight: bold; + padding: 0.5em; + color: #ae0000; + text-decoration: underline; + float:right; + font-size:35px; +} + +#installPercent { + width: 100%; + height: 1.5em; + margin: 0; + padding: 0; + background-color: #eee; + border: 1px solid #ddd; +} +#installPercent P { + height: 1.5em; + background-color: #8aaecc; + margin: 0; + padding: 0; +} + +td { + border-color:#FFFFFF rgb(198, 205, 216) rgb(198, 205, 216) rgb(198, 205, 216) ; + border-style:solid; + border-width:1px; + color:#203276; + padding:0.5em 0.5em 0.5em 0.8em; +} + +.submit { + text-align:center; +} +.submit input{ + margin-top:15px; + background:transparent url(./themes/default/images/background-submit.png) repeat scroll 0%; + font-size:1.4em; + border-color:#CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); + border-style:double; + border-width:3px; + color:#333333; + padding:0.15em; +} + +input { + font-size:1.1em; + border-color:#CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); + border-width:1px; + color:#3A2B16; + padding:0.15em; +} +</style> +{/literal} +<div id="main"> + <div id="content"> + <div id="logo"> + <span id="title">Piwik</span> <span id="subtitle"># {'General_OpenSourceWebAnalytics'|translate}</span> + </div> + <div class="both"></div> + + <div id="generalInstall"> + {include file="Installation/templates/allSteps.tpl"} + </div> + + <div id="detailInstall"> + {include file="$subTemplateToLoad"} + {if $showNextStep} + <p class="nextStep"> + <a href="{url action=$nextModuleName}">{'General_Next'|translate} »</a> + </p> + {/if} + </div> + + <div class="both"></div> + + <h3>{'Installation_InstallationStatus'|translate}</h3> + + <div id="installPercent"> + <p style="width: {$percentDone}%;"></p> + </div> + + {'Installation_PercentDone'|translate:$percentDone} +</div> diff --git a/plugins/Installation/templates/systemCheck.tpl b/plugins/Installation/templates/systemCheck.tpl index 72d80e4dd2..84cd688429 100644 --- a/plugins/Installation/templates/systemCheck.tpl +++ b/plugins/Installation/templates/systemCheck.tpl @@ -1,114 +1,114 @@ -{assign var=ok value="<img src='themes/default/images/ok.png' />"}
-{assign var=error value="<img src='themes/default/images/error.png' />"}
-{assign var=warning value="<img src='themes/default/images/warning.png' />"}
-
-<h1>{'Installation_SystemCheck'|translate}</h1>
-
-
-<table class="infosServer">
- <tr>
- <td class="label">{'Installation_SystemCheckPhp'|translate} > {$infos.phpVersion_minimum}</td>
- <td>{if $infos.phpVersion_ok}{$ok}{else}{$error}{/if}</td>
- </tr><tr>
- <td class="label">{'Installation_SystemCheckPdo'|translate}</td>
- <td>{if $infos.pdo_ok}{$ok}
- {else}{$error}{/if}
- </td>
- </tr>
- <tr>
- <td class="label">{'Installation_SystemCheckPdoMysql'|translate}</td>
- <td>{if $infos.pdo_mysql_ok}{$ok}
- {else}{$error}
- {/if}
-
- {if !$infos.pdo_mysql_ok || !$infos.pdo_ok}
- <p class="error" style="width:80%">{'Installation_SystemCheckPdoError'|translate}
- <small>
- <br /><br />
- {'Installation_SystemCheckPdoHelp'|translate:"<br/><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />":"<code>--with-pdo-mysql </code>":"<br/><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />"}
- </small>
- </p>
- {/if}
-
- </td>
- </tr>
- <tr>
- <td valign="top">
- {'Installation_SystemCheckWriteDirs'|translate}
- </td>
- <td>
- {foreach from=$infos.directories key=dir item=bool}
- {if $bool}{$ok}{else}
- <span style="color:red">{$error}</span>{/if}
- {$dir}
- <br />
- {/foreach}
- </td>
- </tr>
-</table>
-
-{if $problemWithSomeDirectories}
- <br />
- <div class="error">
- {'Installation_SystemCheckWriteDirsHelp'|translate}:
- {foreach from=$infos.directories key=dir item=bool}
- <ul>{if !$bool}
- <li><pre>chmod a+w {$dir}</pre></li>
- {/if}
- </ul>
- {/foreach}
- </div>
- <br />
-{/if}
-<h1>Optional</h1>
-<table class="infos">
- <tr>
- <td class="label">{'Installation_SystemCheckMemoryLimit'|translate}</td>
- <td>
- {$infos.memoryCurrent}
- {if $infos.memory_ok}{$ok}{else}{$warning}
- <br /><i>{'Installation_SystemCheckMemoryLimitHelp'|translate}</i>{/if}
- </td>
- </tr>
- <tr>
- <td class="label">{'Installation_SystemCheckGD'|translate}</td>
- <td>
- {if $infos.gd_ok}{$ok}{else}{$warning} <br /><i>{'Installation_SystemCheckGDHelp'|translate}</i>{/if}
- </td>
- </tr>
- <tr>
- <td class="label">{'Installation_SystemCheckTimeLimit'|translate}</td>
- <td>{if $infos.setTimeLimit_ok}{$ok}{else}{$warning}
- <br /><i>{'Installation_SystemCheckTimeLimitHelp'|translate}</i>{/if}</td>
- </tr>
- <tr>
- <td class="label">{'Installation_SystemCheckMail'|translate}</td>
- <td>{if $infos.mail_ok}{$ok}{else}{$warning}{/if}</td>
- </tr>
-</table>
-
-
-{if !$showNextStep}
-{literal}
-<style>
-#legend {
- border:1px solid #A5A5A5;
- padding:5px;
- color:#727272;
- margin-top:30px;
-}
-</style>
-{/literal}
-<div id="legend"><small>
-<b>Legend</b>
-<br />
-{$ok} {'General_Ok'|translate}<br />
-{$error} {'General_Error'|translate}: {'Installation_SystemCheckError'|translate} <br />
-{$warning} {'General_Warning'|translate}: {'Installation_SystemCheckWarning'|translate} <br />
-</small></div>
-
-
-<p class="nextStep">
- <a href="{url}">{'General_Refresh'|translate} »</a>
-</p>
-{/if}
+{assign var=ok value="<img src='themes/default/images/ok.png' />"} +{assign var=error value="<img src='themes/default/images/error.png' />"} +{assign var=warning value="<img src='themes/default/images/warning.png' />"} + +<h1>{'Installation_SystemCheck'|translate}</h1> + + +<table class="infosServer"> + <tr> + <td class="label">{'Installation_SystemCheckPhp'|translate} > {$infos.phpVersion_minimum}</td> + <td>{if $infos.phpVersion_ok}{$ok}{else}{$error}{/if}</td> + </tr><tr> + <td class="label">{'Installation_SystemCheckPdo'|translate}</td> + <td>{if $infos.pdo_ok}{$ok} + {else}{$error}{/if} + </td> + </tr> + <tr> + <td class="label">{'Installation_SystemCheckPdoMysql'|translate}</td> + <td>{if $infos.pdo_mysql_ok}{$ok} + {else}{$error} + {/if} + + {if !$infos.pdo_mysql_ok || !$infos.pdo_ok} + <p class="error" style="width:80%">{'Installation_SystemCheckPdoError'|translate} + <small> + <br /><br /> + {'Installation_SystemCheckPdoHelp'|translate:"<br/><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />":"<code>--with-pdo-mysql </code>":"<br/><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />"} + </small> + </p> + {/if} + + </td> + </tr> + <tr> + <td valign="top"> + {'Installation_SystemCheckWriteDirs'|translate} + </td> + <td> + {foreach from=$infos.directories key=dir item=bool} + {if $bool}{$ok}{else} + <span style="color:red">{$error}</span>{/if} + {$dir} + <br /> + {/foreach} + </td> + </tr> +</table> + +{if $problemWithSomeDirectories} + <br /> + <div class="error"> + {'Installation_SystemCheckWriteDirsHelp'|translate}: + {foreach from=$infos.directories key=dir item=bool} + <ul>{if !$bool} + <li><pre>chmod a+w {$dir}</pre></li> + {/if} + </ul> + {/foreach} + </div> + <br /> +{/if} +<h1>Optional</h1> +<table class="infos"> + <tr> + <td class="label">{'Installation_SystemCheckMemoryLimit'|translate}</td> + <td> + {$infos.memoryCurrent} + {if $infos.memory_ok}{$ok}{else}{$warning} + <br /><i>{'Installation_SystemCheckMemoryLimitHelp'|translate}</i>{/if} + </td> + </tr> + <tr> + <td class="label">{'Installation_SystemCheckGD'|translate}</td> + <td> + {if $infos.gd_ok}{$ok}{else}{$warning} <br /><i>{'Installation_SystemCheckGDHelp'|translate}</i>{/if} + </td> + </tr> + <tr> + <td class="label">{'Installation_SystemCheckTimeLimit'|translate}</td> + <td>{if $infos.setTimeLimit_ok}{$ok}{else}{$warning} + <br /><i>{'Installation_SystemCheckTimeLimitHelp'|translate}</i>{/if}</td> + </tr> + <tr> + <td class="label">{'Installation_SystemCheckMail'|translate}</td> + <td>{if $infos.mail_ok}{$ok}{else}{$warning}{/if}</td> + </tr> +</table> + + +{if !$showNextStep} +{literal} +<style> +#legend { + border:1px solid #A5A5A5; + padding:5px; + color:#727272; + margin-top:30px; +} +</style> +{/literal} +<div id="legend"><small> +<b>Legend</b> +<br /> +{$ok} {'General_Ok'|translate}<br /> +{$error} {'General_Error'|translate}: {'Installation_SystemCheckError'|translate} <br /> +{$warning} {'General_Warning'|translate}: {'Installation_SystemCheckWarning'|translate} <br /> +</small></div> + + +<p class="nextStep"> + <a href="{url}">{'General_Refresh'|translate} »</a> +</p> +{/if} diff --git a/plugins/Installation/templates/tablesCreation.tpl b/plugins/Installation/templates/tablesCreation.tpl index 32cf736b84..c54571ed76 100644 --- a/plugins/Installation/templates/tablesCreation.tpl +++ b/plugins/Installation/templates/tablesCreation.tpl @@ -1,69 +1,69 @@ -<h1>{'Installation_Tables'|translate}</h1>
-{if isset($someTablesInstalled)}
- <div class="warning">{'Installation_TablesWarning'|translate}
- <img src="themes/default/images/warning_medium.png">
- </div>
- <div id="toggle" style="display:none;color:#4F2410"><small><i>{'Installation_TablesFound'|translate}:
- <br />{$tablesInstalled} </i></small></div>
-
- <p>{'Installation_TablesWarningHelp'|translate}</p>
-
- <p class="nextStep"><a href="{url action=$nextModuleName}">{'Installation_TablesReuse'|translate} »</a></p>
- <p class="nextStep" id="eraseAllTables"><a href="{url deleteTables=1}">{'Installation_TablesDelete'|translate} »</a></p>
-{/if}
-
-{if isset($existingTablesDeleted)}
- <div class="success"> {'Installation_TablesDeletedSuccess'|translate}
- <img src="themes/default/images/success_medium.png"></div>
-{/if}
-
-
-{if isset($databaseCreated)}
- <div class="success"> {'Installation_DatabaseCreatedSuccess'|translate:"'$databaseName'"}
- <img src="themes/default/images/success_medium.png"></div>
-{/if}
-
-{if isset($tablesCreated)}
- <div class="success"> {'Installation_TablesCreatedSuccess'|translate}
- <img src="themes/default/images/success_medium.png"></div>
-{/if}
-
-
-{literal}
-<script>
-$(document).ready( function(){
- {/literal}
- var strConfirmEraseTables = "{'Installation_TablesDeleteConfirm'|translate} ";
- {literal}
-
- // toggle the display of the tables detected during the installation when clicking
- // on the span "linkToggle"
- $("#linkToggle")
- .css("border-bottom","thin dotted #ff5502")
-
- .hover( function() {
- $(this).css({ cursor: "pointer"});
- },
- function() {
- $(this).css({ cursor: "auto"});
- })
- .css("border-bottom","thin dotted #ff5502")
- .click(function(){
- $("#toggle").toggle();} );
-
- $("#eraseAllTables")
- .click( function(){
- if(confirm( strConfirmEraseTables ) )
- {
- window.location.href = $(this).attr('href');
- }
- else
- {
- return false;
- }
- });
-
- ;
-});
-</script>
-{/literal}
+<h1>{'Installation_Tables'|translate}</h1> +{if isset($someTablesInstalled)} + <div class="warning">{'Installation_TablesWarning'|translate} + <img src="themes/default/images/warning_medium.png"> + </div> + <div id="toggle" style="display:none;color:#4F2410"><small><i>{'Installation_TablesFound'|translate}: + <br />{$tablesInstalled} </i></small></div> + + <p>{'Installation_TablesWarningHelp'|translate}</p> + + <p class="nextStep"><a href="{url action=$nextModuleName}">{'Installation_TablesReuse'|translate} »</a></p> + <p class="nextStep" id="eraseAllTables"><a href="{url deleteTables=1}">{'Installation_TablesDelete'|translate} »</a></p> +{/if} + +{if isset($existingTablesDeleted)} + <div class="success"> {'Installation_TablesDeletedSuccess'|translate} + <img src="themes/default/images/success_medium.png"></div> +{/if} + + +{if isset($databaseCreated)} + <div class="success"> {'Installation_DatabaseCreatedSuccess'|translate:"'$databaseName'"} + <img src="themes/default/images/success_medium.png"></div> +{/if} + +{if isset($tablesCreated)} + <div class="success"> {'Installation_TablesCreatedSuccess'|translate} + <img src="themes/default/images/success_medium.png"></div> +{/if} + + +{literal} +<script> +$(document).ready( function(){ + {/literal} + var strConfirmEraseTables = "{'Installation_TablesDeleteConfirm'|translate} "; + {literal} + + // toggle the display of the tables detected during the installation when clicking + // on the span "linkToggle" + $("#linkToggle") + .css("border-bottom","thin dotted #ff5502") + + .hover( function() { + $(this).css({ cursor: "pointer"}); + }, + function() { + $(this).css({ cursor: "auto"}); + }) + .css("border-bottom","thin dotted #ff5502") + .click(function(){ + $("#toggle").toggle();} ); + + $("#eraseAllTables") + .click( function(){ + if(confirm( strConfirmEraseTables ) ) + { + window.location.href = $(this).attr('href'); + } + else + { + return false; + } + }); + + ; +}); +</script> +{/literal} diff --git a/plugins/Installation/templates/welcome.tpl b/plugins/Installation/templates/welcome.tpl index 7abe79222f..c2985c3c36 100644 --- a/plugins/Installation/templates/welcome.tpl +++ b/plugins/Installation/templates/welcome.tpl @@ -1,4 +1,4 @@ -<h1>{'Installation_Welcome'|translate}</h1>
-
-{'Installation_WelcomeHelp'|translate:$totalNumberOfSteps}
-
+<h1>{'Installation_Welcome'|translate}</h1> + +{'Installation_WelcomeHelp'|translate:$totalNumberOfSteps} + diff --git a/plugins/Login/templates/header.tpl b/plugins/Login/templates/header.tpl index 4d81aef3ea..fc472a31d6 100644 --- a/plugins/Login/templates/header.tpl +++ b/plugins/Login/templates/header.tpl @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<head>
- <title>Piwik › Login</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
- {literal}
- <script type="text/javascript">
- function focusit() {
- var formLogin = document.getElementById('form_login');
- if(formLogin)
- {
- formLogin.focus();
- }
- }
- window.onload = focusit;
- </script>
- {/literal}
- <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico">
- <link rel="stylesheet" href="plugins/Login/templates/login.css" type="text/css" media="screen" />
-</head>
-
-<body class="login">
-<!-- shamelessly taken from wordpress 2.5 - thank you guys!!! -->
-
-<div id="logo">
- <a href="http://piwik.org" title="{$linkTitle}"><span class="h1"><span style="color: rgb(245, 223, 114);">P</span><span style="color: rgb(241, 175, 108);">i</span><span style="color: rgb(241, 117, 117);">w</span><span style="color: rgb(155, 106, 58);">i</span><span style="color: rgb(107, 50, 11);">k</span> <span class="description"># {'General_OpenSourceWebAnalytics'|translate}</span></span></a>
-</div>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> +<head> + <title>Piwik › Login</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + + {literal} + <script type="text/javascript"> + function focusit() { + var formLogin = document.getElementById('form_login'); + if(formLogin) + { + formLogin.focus(); + } + } + window.onload = focusit; + </script> + {/literal} + <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"> + <link rel="stylesheet" href="plugins/Login/templates/login.css" type="text/css" media="screen" /> +</head> + +<body class="login"> +<!-- shamelessly taken from wordpress 2.5 - thank you guys!!! --> + +<div id="logo"> + <a href="http://piwik.org" title="{$linkTitle}"><span class="h1"><span style="color: rgb(245, 223, 114);">P</span><span style="color: rgb(241, 175, 108);">i</span><span style="color: rgb(241, 117, 117);">w</span><span style="color: rgb(155, 106, 58);">i</span><span style="color: rgb(107, 50, 11);">k</span> <span class="description"># {'General_OpenSourceWebAnalytics'|translate}</span></span></a> +</div> diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css index d6b3b0f93c..e49561fa2d 100644 --- a/plugins/Login/templates/login.css +++ b/plugins/Login/templates/login.css @@ -150,4 +150,4 @@ a { font-weight: normal; color: #879dbd; font-size: 19pt; -}
\ No newline at end of file +} diff --git a/plugins/Login/templates/login.tpl b/plugins/Login/templates/login.tpl index 0484425181..3ec3f76e2c 100644 --- a/plugins/Login/templates/login.tpl +++ b/plugins/Login/templates/login.tpl @@ -1,47 +1,47 @@ -{include file="Login/templates/header.tpl"}
-
-<div id="login">
-
-{if $form_data.errors}
-<div id="login_error">
- {foreach from=$form_data.errors item=data}
- <strong>{'General_Error'|translate}</strong>: {$data}<br />
- {/foreach}
-</div>
-{/if}
-
-{if $AccessErrorString}
-<div id="login_error"><strong>{'General_Error'|translate}</strong>: {$AccessErrorString}<br /></div>
-{/if}
-
-<form {$form_data.attributes}>
- <p>
- <label>{'Login_Login'|translate}:<br />
- <input type="text" name="form_login" id="form_login" class="input" value="" size="20" tabindex="10" /></label>
- </p>
-
- <p>
- <label>{'Login_Password'|translate}:<br />
- <input type="password" name="form_password" id="form_password" class="input" value="" size="20" tabindex="20" /></label>
- </p>
- {*
- <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> Remember Me</label></p>
- *}
- {$form_data.form_url.html}
- <p class="submit">
- <input type="submit" value="{'Login_LogIn'|translate}" tabindex="100" />
- </p>
-</form>
-
-
-<p id="nav">
-<a href="?module=Login&action=lostPassword&form_url={$urlToRedirect|escape:url}" title="{'Login_LostYourPassword'|translate}">{'Login_LostYourPassword'|translate}</a>
-</p>
-
-</div>
-
-</body>
-</html>
-
-
-
+{include file="Login/templates/header.tpl"} + +<div id="login"> + +{if $form_data.errors} +<div id="login_error"> + {foreach from=$form_data.errors item=data} + <strong>{'General_Error'|translate}</strong>: {$data}<br /> + {/foreach} +</div> +{/if} + +{if $AccessErrorString} +<div id="login_error"><strong>{'General_Error'|translate}</strong>: {$AccessErrorString}<br /></div> +{/if} + +<form {$form_data.attributes}> + <p> + <label>{'Login_Login'|translate}:<br /> + <input type="text" name="form_login" id="form_login" class="input" value="" size="20" tabindex="10" /></label> + </p> + + <p> + <label>{'Login_Password'|translate}:<br /> + <input type="password" name="form_password" id="form_password" class="input" value="" size="20" tabindex="20" /></label> + </p> + {* + <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> Remember Me</label></p> + *} + {$form_data.form_url.html} + <p class="submit"> + <input type="submit" value="{'Login_LogIn'|translate}" tabindex="100" /> + </p> +</form> + + +<p id="nav"> +<a href="?module=Login&action=lostPassword&form_url={$urlToRedirect|escape:url}" title="{'Login_LostYourPassword'|translate}">{'Login_LostYourPassword'|translate}</a> +</p> + +</div> + +</body> +</html> + + + diff --git a/plugins/Login/templates/lostPassword.tpl b/plugins/Login/templates/lostPassword.tpl index d114918c89..3da5ebdec2 100644 --- a/plugins/Login/templates/lostPassword.tpl +++ b/plugins/Login/templates/lostPassword.tpl @@ -1,44 +1,44 @@ -{include file="Login/templates/header.tpl"}
-
-<div id="login">
-
-{if $form_data.errors}
-<div id="login_error">
- {foreach from=$form_data.errors item=data}
- <strong>{'General_Error'|translate}</strong>: {$data}<br />
- {/foreach}
-</div>
-{/if}
-
-{if $AccessErrorString}
-<div id="login_error"><strong>{'General_Error'|translate}</strong>: {$AccessErrorString}<br /></div>
-{/if}
-
-<p class="message">
-{'Login_PasswordReminder'|translate}
-</p>
-
-<form {$form_data.attributes}>
-
- <p>
- <label>{'Login_LoginOrEmail'|translate}:<br />
- <input type="text" name="form_login" id="form_login" class="input" value="" size="20" tabindex="10" /></label>
- </p>
- {$form_data.form_url.html}
- <p class="submit">
- <input type="submit" value="{'Login_RemindPassword'|translate}" tabindex="100" />
- </p>
-</form>
-
-
-<p id="nav">
-<a href="?module=Login&form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a>
-</p>
-
-</div>
-
-</body>
-</html>
-
-
-
+{include file="Login/templates/header.tpl"} + +<div id="login"> + +{if $form_data.errors} +<div id="login_error"> + {foreach from=$form_data.errors item=data} + <strong>{'General_Error'|translate}</strong>: {$data}<br /> + {/foreach} +</div> +{/if} + +{if $AccessErrorString} +<div id="login_error"><strong>{'General_Error'|translate}</strong>: {$AccessErrorString}<br /></div> +{/if} + +<p class="message"> +{'Login_PasswordReminder'|translate} +</p> + +<form {$form_data.attributes}> + + <p> + <label>{'Login_LoginOrEmail'|translate}:<br /> + <input type="text" name="form_login" id="form_login" class="input" value="" size="20" tabindex="10" /></label> + </p> + {$form_data.form_url.html} + <p class="submit"> + <input type="submit" value="{'Login_RemindPassword'|translate}" tabindex="100" /> + </p> +</form> + + +<p id="nav"> +<a href="?module=Login&form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a> +</p> + +</div> + +</body> +</html> + + + diff --git a/plugins/Login/templates/passwordsent.tpl b/plugins/Login/templates/passwordsent.tpl index 1355c2781a..b45f928f0d 100644 --- a/plugins/Login/templates/passwordsent.tpl +++ b/plugins/Login/templates/passwordsent.tpl @@ -1,25 +1,25 @@ -{include file="Login/templates/header.tpl"}
-
-<div id="login">
-
-{if isset($ErrorString)}
- <div id="login_error"><strong>{'General_Error'|translate}</strong>: {$ErrorString}<br />
- {'Login_ContactAdmin'|translate}
- </div>
-{else}
- <p class="message">
- {'Login_PasswordSent'|translate}
- </p>
-{/if}
-
-<p id="nav">
-<a href="?module=Login&form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a>
-</p>
-
-</div>
-
-</body>
-</html>
-
-
-
+{include file="Login/templates/header.tpl"} + +<div id="login"> + +{if isset($ErrorString)} + <div id="login_error"><strong>{'General_Error'|translate}</strong>: {$ErrorString}<br /> + {'Login_ContactAdmin'|translate} + </div> +{else} + <p class="message"> + {'Login_PasswordSent'|translate} + </p> +{/if} + +<p id="nav"> +<a href="?module=Login&form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a> +</p> + +</div> + +</body> +</html> + + + diff --git a/plugins/Referers/templates/index.tpl b/plugins/Referers/templates/index.tpl index df1995c81e..c5e25f8698 100644 --- a/plugins/Referers/templates/index.tpl +++ b/plugins/Referers/templates/index.tpl @@ -1,39 +1,39 @@ -<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script>
-
- <a name="evolutionGraph" graphId="{$nameGraphEvolutionReferers}"></a>
- <h2>{'Referers_Evolution'|translate}</h2>
- {$graphEvolutionReferers}
-
- <h2>{'Referers_Type'|translate}</h2>
- <table>
- <tr><td>
- <p>{sparkline src=$urlSparklineDirectEntry}<span>
- {'Referers_TypeDirectEntries'|translate:"<strong>$visitorsFromDirectEntry</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineSearchEngines}<span>
- {'Referers_TypeSearchEngines'|translate:"<strong>$visitorsFromSearchEngines</strong>"}</span></p>
- </td><td>
- <p>{sparkline src=$urlSparklineWebsites}<span>
- {'Referers_TypeWebsites'|translate:"<strong>$visitorsFromWebsites</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineCampaigns}<span>
- {'Referers_TypeCampaigns'|translate:"<strong>$visitorsFromCampaigns</strong>"}</span></p>
- </td></tr>
- </table>
-
- <h2>{'Referers_Other'|translate}</h2>
- <table>
- <tr><td>
- <p>{sparkline src=$urlSparklineDistinctSearchEngines}<span>
- {'Referers_OtherDistinctSearchEngines'|translate:"<strong>$numberDistinctSearchEngines</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineDistinctKeywords}<span>
- {'Referers_OtherDistinctKeywords'|translate:"<strong>$numberDistinctKeywords</strong>"}</span></p>
- </td><td>
- <p>{sparkline src=$urlSparklineDistinctWebsites}<span>
- {'Referers_OtherDistinctWebsites'|translate:"<strong>$numberDistinctWebsites</strong>":"<strong>$numberDistinctWebsitesUrls</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineDistinctCampaigns}<span>
- {'Referers_OtherDistinctCampaigns'|translate:"<strong>$numberDistinctCampaigns</strong>"}</span></p>
- </td></tr>
- </table>
-
- <p>{'Referers_TagCloud'|translate}</p>
- {$dataTableRefererType}
-
+<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script> + + <a name="evolutionGraph" graphId="{$nameGraphEvolutionReferers}"></a> + <h2>{'Referers_Evolution'|translate}</h2> + {$graphEvolutionReferers} + + <h2>{'Referers_Type'|translate}</h2> + <table> + <tr><td> + <p>{sparkline src=$urlSparklineDirectEntry}<span> + {'Referers_TypeDirectEntries'|translate:"<strong>$visitorsFromDirectEntry</strong>"}</span></p> + <p>{sparkline src=$urlSparklineSearchEngines}<span> + {'Referers_TypeSearchEngines'|translate:"<strong>$visitorsFromSearchEngines</strong>"}</span></p> + </td><td> + <p>{sparkline src=$urlSparklineWebsites}<span> + {'Referers_TypeWebsites'|translate:"<strong>$visitorsFromWebsites</strong>"}</span></p> + <p>{sparkline src=$urlSparklineCampaigns}<span> + {'Referers_TypeCampaigns'|translate:"<strong>$visitorsFromCampaigns</strong>"}</span></p> + </td></tr> + </table> + + <h2>{'Referers_Other'|translate}</h2> + <table> + <tr><td> + <p>{sparkline src=$urlSparklineDistinctSearchEngines}<span> + {'Referers_OtherDistinctSearchEngines'|translate:"<strong>$numberDistinctSearchEngines</strong>"}</span></p> + <p>{sparkline src=$urlSparklineDistinctKeywords}<span> + {'Referers_OtherDistinctKeywords'|translate:"<strong>$numberDistinctKeywords</strong>"}</span></p> + </td><td> + <p>{sparkline src=$urlSparklineDistinctWebsites}<span> + {'Referers_OtherDistinctWebsites'|translate:"<strong>$numberDistinctWebsites</strong>":"<strong>$numberDistinctWebsitesUrls</strong>"}</span></p> + <p>{sparkline src=$urlSparklineDistinctCampaigns}<span> + {'Referers_OtherDistinctCampaigns'|translate:"<strong>$numberDistinctCampaigns</strong>"}</span></p> + </td></tr> + </table> + + <p>{'Referers_TagCloud'|translate}</p> + {$dataTableRefererType} + diff --git a/plugins/Referers/templates/searchEngines_Keywords.tpl b/plugins/Referers/templates/searchEngines_Keywords.tpl index a664aefb50..c60a841e23 100644 --- a/plugins/Referers/templates/searchEngines_Keywords.tpl +++ b/plugins/Referers/templates/searchEngines_Keywords.tpl @@ -1,9 +1,9 @@ -<div id='leftcolumn'>
- <h2>{'Referers_SearchEngines'|translate}</h2>
- {$searchEngines}
-</div>
-
-<div id='rightcolumn'>
- <h2>{'Referers_Keywords'|translate}</h2>
- {$keywords}
-</div>
+<div id='leftcolumn'> + <h2>{'Referers_SearchEngines'|translate}</h2> + {$searchEngines} +</div> + +<div id='rightcolumn'> + <h2>{'Referers_Keywords'|translate}</h2> + {$keywords} +</div> diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 7858d9a829..0ac9cbfe3d 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -36,4 +36,4 @@ class Piwik_SitesManager_Controller extends Piwik_Controller $view->jsTag = $jsTag; echo $view->render(); } -}
\ No newline at end of file +} diff --git a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl index 784557308c..e601c8dc58 100644 --- a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl +++ b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl @@ -1,27 +1,27 @@ -{loadJavascriptTranslations plugins='SitesManager'}
-{assign var=showSitesSelection value=false}
-{assign var=showPeriodSelection value=false}
-{include file="CoreAdminHome/templates/header.tpl"}
-{include file="CoreAdminHome/templates/menu.tpl"}
-
-{literal}
-<style>
-code {
- background-color:#F0F7FF;
- border-color:#00008B;
- border-style:dashed dashed dashed solid;
- border-width:1px 1px 1px 5px;
- direction:ltr;
- display:block;
- font-size:80%;
- margin:2px 2px 20px;
- padding:4px;
- text-align:left;
- font-family: "Courier New" Courier monospace;
-}
-</style>
-{/literal}
-
-<p>{'SitesManager_JsCodeHelp'|translate}:</p>
-
-<code>{$jsTag}</code>
+{loadJavascriptTranslations plugins='SitesManager'} +{assign var=showSitesSelection value=false} +{assign var=showPeriodSelection value=false} +{include file="CoreAdminHome/templates/header.tpl"} +{include file="CoreAdminHome/templates/menu.tpl"} + +{literal} +<style> +code { + background-color:#F0F7FF; + border-color:#00008B; + border-style:dashed dashed dashed solid; + border-width:1px 1px 1px 5px; + direction:ltr; + display:block; + font-size:80%; + margin:2px 2px 20px; + padding:4px; + text-align:left; + font-family: "Courier New" Courier monospace; +} +</style> +{/literal} + +<p>{'SitesManager_JsCodeHelp'|translate}:</p> + +<code>{$jsTag}</code> diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl index e9cec2405a..d90a27c29f 100644 --- a/plugins/SitesManager/templates/SitesManager.tpl +++ b/plugins/SitesManager/templates/SitesManager.tpl @@ -1,64 +1,64 @@ -{loadJavascriptTranslations plugins='SitesManager'}
-{assign var=showSitesSelection value=false}
-{assign var=showPeriodSelection value=false}
-{include file="CoreAdminHome/templates/header.tpl"}
-{include file="CoreAdminHome/templates/menu.tpl"}
-
-<script type="text/javascript" src="plugins/SitesManager/templates/SitesManager.js"></script>
-{literal}
-<style>
-.addRowSite:hover, .editableSite:hover, .addsite:hover, .cancel:hover, .deleteSite:hover, .editSite:hover, .updateSite:hover{
- cursor: pointer;
-}
-.addRowSite a {
- text-decoration: none;
-}
-.addRowSite {
- padding:1em;
- font-color:#3A477B;
- padding:1em;
- font-weight:bold;
-}
-#editSites {
- valign: top;
-}
-</style>
-{/literal}
-<h2>{'SitesManager_WebsitesManagement'|translate}</h2>
-<p>{'SitesManager_MainDescription'|translate}</p>
-
-<div id="ajaxError" style="display:none"></div>
-<div id="ajaxLoading" style="display:none"><div id="loadingPiwik"><img src="themes/default/images/loading-blue.gif" alt="" /> {'General_LoadingData'|translate} </div></div>
-
-{if $adminSites|@count == 0}
- {'SitesManager_NoWebsites'|translate}
-{else}
- <table class="admin" id="editSites" border=1 cellpadding="10">
- <thead>
- <tr>
- <th>{'SitesManager_Id'|translate}</th>
- <th>{'SitesManager_Name'|translate}</th>
- <th>{'SitesManager_Urls'|translate}</th>
- <th> </th>
- <th> </th>
- <th> {'SitesManager_JsCode'|translate} </th>
- </tr>
- </thead>
- <tbody>
- {foreach from=$adminSites key=i item=site}
- <tr id="row{$i}">
- <td id="idSite">{$site.idsite}</td>
- <td id="siteName" class="editableSite">{$site.name}</td>
- <td id="urls" class="editableSite">{foreach from=$site.alias_urls item=url}{$url}<br />{/foreach}</td>
- <td><img src='plugins/UsersManager/images/edit.png' class="editSite" id="row{$i}" href='#' alt="" /></td>
- <td><img src='plugins/UsersManager/images/remove.png' class="deleteSite" id="row{$i}" value="{'General_Delete'|translate}" alt="" /></td>
- <td><a href='{url action=displayJavascriptCode idsite=$site.idsite}'>{'SitesManager_ShowJsCode'|translate}</a></td>
- </tr>
- {/foreach}
-
- </tbody>
- </table>
- <div class="addRowSite"><a href="#"><img src='plugins/UsersManager/images/add.png' alt="" /> {'SitesManager_AddSite'|translate}</a></div>
-{/if}
-
-{include file="CoreAdminHome/templates/footer.tpl"}
+{loadJavascriptTranslations plugins='SitesManager'} +{assign var=showSitesSelection value=false} +{assign var=showPeriodSelection value=false} +{include file="CoreAdminHome/templates/header.tpl"} +{include file="CoreAdminHome/templates/menu.tpl"} + +<script type="text/javascript" src="plugins/SitesManager/templates/SitesManager.js"></script> +{literal} +<style> +.addRowSite:hover, .editableSite:hover, .addsite:hover, .cancel:hover, .deleteSite:hover, .editSite:hover, .updateSite:hover{ + cursor: pointer; +} +.addRowSite a { + text-decoration: none; +} +.addRowSite { + padding:1em; + font-color:#3A477B; + padding:1em; + font-weight:bold; +} +#editSites { + valign: top; +} +</style> +{/literal} +<h2>{'SitesManager_WebsitesManagement'|translate}</h2> +<p>{'SitesManager_MainDescription'|translate}</p> + +<div id="ajaxError" style="display:none"></div> +<div id="ajaxLoading" style="display:none"><div id="loadingPiwik"><img src="themes/default/images/loading-blue.gif" alt="" /> {'General_LoadingData'|translate} </div></div> + +{if $adminSites|@count == 0} + {'SitesManager_NoWebsites'|translate} +{else} + <table class="admin" id="editSites" border=1 cellpadding="10"> + <thead> + <tr> + <th>{'SitesManager_Id'|translate}</th> + <th>{'SitesManager_Name'|translate}</th> + <th>{'SitesManager_Urls'|translate}</th> + <th> </th> + <th> </th> + <th> {'SitesManager_JsCode'|translate} </th> + </tr> + </thead> + <tbody> + {foreach from=$adminSites key=i item=site} + <tr id="row{$i}"> + <td id="idSite">{$site.idsite}</td> + <td id="siteName" class="editableSite">{$site.name}</td> + <td id="urls" class="editableSite">{foreach from=$site.alias_urls item=url}{$url}<br />{/foreach}</td> + <td><img src='plugins/UsersManager/images/edit.png' class="editSite" id="row{$i}" href='#' alt="" /></td> + <td><img src='plugins/UsersManager/images/remove.png' class="deleteSite" id="row{$i}" value="{'General_Delete'|translate}" alt="" /></td> + <td><a href='{url action=displayJavascriptCode idsite=$site.idsite}'>{'SitesManager_ShowJsCode'|translate}</a></td> + </tr> + {/foreach} + + </tbody> + </table> + <div class="addRowSite"><a href="#"><img src='plugins/UsersManager/images/add.png' alt="" /> {'SitesManager_AddSite'|translate}</a></div> +{/if} + +{include file="CoreAdminHome/templates/footer.tpl"} diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php index e6bc371649..61c3be4f54 100644 --- a/plugins/UserCountry/functions.php +++ b/plugins/UserCountry/functions.php @@ -31,4 +31,4 @@ function Piwik_CountryTranslate($label) return Piwik_Translate('General_Unknown'); } return Piwik_Translate('UserCountry_country_'. $label); -}
\ No newline at end of file +} diff --git a/plugins/UserCountry/index.tpl b/plugins/UserCountry/index.tpl index a6ffb1345f..efea18c986 100644 --- a/plugins/UserCountry/index.tpl +++ b/plugins/UserCountry/index.tpl @@ -1,14 +1,14 @@ -{postEvent name="template_headerUserCountry"}
-
-<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script>
-
-<h2>{'UserCountry_Country'|translate}</h2>
-{$dataTableCountry}
-
-<h2>{'UserCountry_Continent'|translate}</h2>
-{$dataTableContinent}
-
-<p>{sparkline src=$urlSparklineCountries}<span>
-{'UserCountry_DistinctCountries'|translate:"<strong>$numberDistinctCountries</strong>"} </span></p>
-
-{postEvent name="template_footerUserCountry"}
+{postEvent name="template_headerUserCountry"} + +<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script> + +<h2>{'UserCountry_Country'|translate}</h2> +{$dataTableCountry} + +<h2>{'UserCountry_Continent'|translate}</h2> +{$dataTableContinent} + +<p>{sparkline src=$urlSparklineCountries}<span> +{'UserCountry_DistinctCountries'|translate:"<strong>$numberDistinctCountries</strong>"} </span></p> + +{postEvent name="template_footerUserCountry"} diff --git a/plugins/UserSettings/index.tpl b/plugins/UserSettings/index.tpl index d8bb0efa92..91400a6e7c 100644 --- a/plugins/UserSettings/index.tpl +++ b/plugins/UserSettings/index.tpl @@ -1,29 +1,29 @@ -<div id='leftcolumn'>
- <h2>{'UserSettings_BrowserFamilies'|translate}</h2>
- {$dataTableBrowserType}
-
- <h2>{'UserSettings_Browsers'|translate}</h2>
- {$dataTableBrowser}
-
- <h2>{'UserSettings_Plugins'|translate}</h2>
- {$dataTablePlugin}
-</div>
-
-<div id='rightcolumn'>
- <h2>{'UserSettings_Configurations'|translate}</h2>
- {$dataTableConfiguration}
-
- <h2>{'UserSettings_OperatinsSystems'|translate}</h2>
- {$dataTableOS}
-
- <h2>{'UserSettings_Resolutions'|translate}</h2>
- {$dataTableResolution}
-
- <h2>{'UserSettings_WideScreen'|translate}</h2>
- {$dataTableWideScreen}
-</div>
-
-
-
-
-
+<div id='leftcolumn'> + <h2>{'UserSettings_BrowserFamilies'|translate}</h2> + {$dataTableBrowserType} + + <h2>{'UserSettings_Browsers'|translate}</h2> + {$dataTableBrowser} + + <h2>{'UserSettings_Plugins'|translate}</h2> + {$dataTablePlugin} +</div> + +<div id='rightcolumn'> + <h2>{'UserSettings_Configurations'|translate}</h2> + {$dataTableConfiguration} + + <h2>{'UserSettings_OperatinsSystems'|translate}</h2> + {$dataTableOS} + + <h2>{'UserSettings_Resolutions'|translate}</h2> + {$dataTableResolution} + + <h2>{'UserSettings_WideScreen'|translate}</h2> + {$dataTableWideScreen} +</div> + + + + + diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl index 587938344e..07b066c6b0 100644 --- a/plugins/UsersManager/templates/UsersManager.tpl +++ b/plugins/UsersManager/templates/UsersManager.tpl @@ -1,144 +1,144 @@ -{assign var=showSitesSelection value=false}
-{assign var=showPeriodSelection value=false}
-{include file="CoreAdminHome/templates/header.tpl"}
-{loadJavascriptTranslations plugins='UsersManager'}
-{include file="CoreAdminHome/templates/menu.tpl"}
-
-{literal}
-<style>
-.dialog {
- display: none;
- padding:20px 10px;
- color:#7A0101;
- cursor:wait;
- font-size:1.2em;
- font-weight:bold;
- text-align:center;
-}
-
-#accessUpdated {
- color: red;
- text-align: center;
- font-weight: bold;
- width: 350px;
- margin: 10px;
- padding: 10px;
- display: none;
- border: 3px solid green;
- color: green;
-}
-#access td, #users td {
- spacing: 0px;
- padding: 2px 5px 5px 4px;
- border: 1px solid #660000;
- width: 100px;
-}
-.editable:hover, .addrow:hover, .updateAccess:hover, .accessGranted:hover, .adduser:hover, .edituser:hover, .deleteuser:hover, .updateuser:hover, .cancel:hover{
- cursor: pointer;
-}
-
-.addrow {
- font-color:#3A477B;
- padding:1em;
- font-weight:bold;
-}
-.addrow a {
- text-decoration: none;
-}
-.addrow img {
- vertical-align: middle;
-}
-</style>
-{/literal}
-
-<h2>{'UsersManager_ManageAccess'|translate}</h2>
-<p>{'UsersManager_MainDescription'|translate}</p>
-<div id="sites">
-<form method="post" action="{url action=index}" id="accessSites">
- <p>{'UsersManager_Sites'|translate}: <select id="selectIdsite" name="idsite" onchange="this.form.submit()">
-
- <optgroup label="{'UsersManager_AllWebsites'|translate}">
- <option label="{'UsersManager_AllWebsites'|translate}" value="all" {if $idSiteSelected=='all'} selected="selected"{/if}>{'UsersManager_ApplyToAllWebsites'|translate}</option>
- </optgroup>
-
- <optgroup label="{'UsersManager_Sites'|translate}">
- {foreach from=$websites item=info}
- <option value="{$info.idsite}" {if $idSiteSelected==$info.idsite} selected="selected"{/if}>{$info.name}</option>
- {/foreach}
- </optgroup>
-
- </select></p>
-</form>
-</div>
-
-<table class="admin" id="access">
-<thead>
-<tr>
- <th>{'UsersManager_User'|translate}</th>
- <th>{'UsersManager_PrivNone'|translate}</th>
- <th>{'UsersManager_PrivView'|translate}</th>
- <th>{'UsersManager_PrivAdmin'|translate}</th>
-</tr>
-</thead>
-
-<tbody>
-{foreach from=$usersAccessByWebsite key=login item=access}
-{assign var=accesValid value="<img src='plugins/UsersManager/images/ok.png' class='accessGranted'>"}
-{assign var=accesInvalid value="<img src='plugins/UsersManager/images/no-access.png' class='updateAccess'>"}
-<tr>
- <td id='login'>{$login}</td>
- <td id='noaccess'>{if $access=='noaccess' and $idSiteSelected!='all'}{$accesValid}{else}{$accesInvalid}{/if} </td>
- <td id='view'>{if $access=='view' and $idSiteSelected!='all'}{$accesValid}{else}{$accesInvalid}{/if} </td>
- <td id='admin'>{if $access=='admin' and $idSiteSelected!='all'}{$accesValid}{else}{$accesInvalid}{/if} </td>
-</tr>
-{/foreach}
-</tbody>
-</table>
-
-<div id="accessUpdated">{'General_Done'|translate}!</div>
-
-<div class="dialog" id="confirm">
- <p>{'UsersManager_ChangeAllConfirm'|translate:"<span id='login'></span>"}</p>
- <input id="yes" type="button" value="{'General_Yes'|translate}"/>
- <input id="no" type="button" value="{'General_No'|translate}"/>
-</div>
-
-<br/>
-<h2>{'UsersManager_UsersManagement'|translate}</h2>
-<p>{'UsersManager_UsersManagementMainDescription'|translate}</p>
-<div id="ajaxError" style="display:none"></div>
-<div id="ajaxLoading" style="display:none"><div id="loadingPiwik"><img src="themes/default/images/loading-blue.gif" alt="" /> {'General_LoadingData'|translate}</div></div>
-<table class="admin" id="users">
- <thead>
- <tr>
- <th>{'UsersManager_Login'|translate}</th>
- <th>{'UsersManager_Password'|translate}</th>
- <th>{'UsersManager_Email'|translate}</th>
- <th>{'UsersManager_Alias'|translate}</th>
- <th>{'UsersManager_Token'|translate}</th>
- <th>{'General_Edit'|translate}</th>
- <th>{'General_Delete'|translate}</th>
- </tr>
- </thead>
-
- <tbody>
- {foreach from=$users item=user key=i}
- {if $user.login != 'anonymous'}
- <tr class="editable" id="row{$i}">
- <td id="userLogin" class="editable">{$user.login}</td>
- <td id="password" class="editable">-</td>
- <td id="email" class="editable">{$user.email}</td>
- <td id="alias" class="editable">{$user.alias}</td>
- <td id="alias">{$user.token_auth}</td>
- <td><img src='plugins/UsersManager/images/edit.png' class="edituser" id="row{$i}" href='#'></td>
- <td><img src='plugins/UsersManager/images/remove.png' class="deleteuser" id="row{$i}" value="Delete"></td>
- </tr>
- {/if}
- {/foreach}
- </tbody>
-</table>
-
-<div class="addrow"><a href="#"><img src='plugins/UsersManager/images/add.png'> {'UsersManager_AddUser'|translate}</a></div>
-<script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script>
-
-{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file +{assign var=showSitesSelection value=false} +{assign var=showPeriodSelection value=false} +{include file="CoreAdminHome/templates/header.tpl"} +{loadJavascriptTranslations plugins='UsersManager'} +{include file="CoreAdminHome/templates/menu.tpl"} + +{literal} +<style> +.dialog { + display: none; + padding:20px 10px; + color:#7A0101; + cursor:wait; + font-size:1.2em; + font-weight:bold; + text-align:center; +} + +#accessUpdated { + color: red; + text-align: center; + font-weight: bold; + width: 350px; + margin: 10px; + padding: 10px; + display: none; + border: 3px solid green; + color: green; +} +#access td, #users td { + spacing: 0px; + padding: 2px 5px 5px 4px; + border: 1px solid #660000; + width: 100px; +} +.editable:hover, .addrow:hover, .updateAccess:hover, .accessGranted:hover, .adduser:hover, .edituser:hover, .deleteuser:hover, .updateuser:hover, .cancel:hover{ + cursor: pointer; +} + +.addrow { + font-color:#3A477B; + padding:1em; + font-weight:bold; +} +.addrow a { + text-decoration: none; +} +.addrow img { + vertical-align: middle; +} +</style> +{/literal} + +<h2>{'UsersManager_ManageAccess'|translate}</h2> +<p>{'UsersManager_MainDescription'|translate}</p> +<div id="sites"> +<form method="post" action="{url action=index}" id="accessSites"> + <p>{'UsersManager_Sites'|translate}: <select id="selectIdsite" name="idsite" onchange="this.form.submit()"> + + <optgroup label="{'UsersManager_AllWebsites'|translate}"> + <option label="{'UsersManager_AllWebsites'|translate}" value="all" {if $idSiteSelected=='all'} selected="selected"{/if}>{'UsersManager_ApplyToAllWebsites'|translate}</option> + </optgroup> + + <optgroup label="{'UsersManager_Sites'|translate}"> + {foreach from=$websites item=info} + <option value="{$info.idsite}" {if $idSiteSelected==$info.idsite} selected="selected"{/if}>{$info.name}</option> + {/foreach} + </optgroup> + + </select></p> +</form> +</div> + +<table class="admin" id="access"> +<thead> +<tr> + <th>{'UsersManager_User'|translate}</th> + <th>{'UsersManager_PrivNone'|translate}</th> + <th>{'UsersManager_PrivView'|translate}</th> + <th>{'UsersManager_PrivAdmin'|translate}</th> +</tr> +</thead> + +<tbody> +{foreach from=$usersAccessByWebsite key=login item=access} +{assign var=accesValid value="<img src='plugins/UsersManager/images/ok.png' class='accessGranted'>"} +{assign var=accesInvalid value="<img src='plugins/UsersManager/images/no-access.png' class='updateAccess'>"} +<tr> + <td id='login'>{$login}</td> + <td id='noaccess'>{if $access=='noaccess' and $idSiteSelected!='all'}{$accesValid}{else}{$accesInvalid}{/if} </td> + <td id='view'>{if $access=='view' and $idSiteSelected!='all'}{$accesValid}{else}{$accesInvalid}{/if} </td> + <td id='admin'>{if $access=='admin' and $idSiteSelected!='all'}{$accesValid}{else}{$accesInvalid}{/if} </td> +</tr> +{/foreach} +</tbody> +</table> + +<div id="accessUpdated">{'General_Done'|translate}!</div> + +<div class="dialog" id="confirm"> + <p>{'UsersManager_ChangeAllConfirm'|translate:"<span id='login'></span>"}</p> + <input id="yes" type="button" value="{'General_Yes'|translate}"/> + <input id="no" type="button" value="{'General_No'|translate}"/> +</div> + +<br/> +<h2>{'UsersManager_UsersManagement'|translate}</h2> +<p>{'UsersManager_UsersManagementMainDescription'|translate}</p> +<div id="ajaxError" style="display:none"></div> +<div id="ajaxLoading" style="display:none"><div id="loadingPiwik"><img src="themes/default/images/loading-blue.gif" alt="" /> {'General_LoadingData'|translate}</div></div> +<table class="admin" id="users"> + <thead> + <tr> + <th>{'UsersManager_Login'|translate}</th> + <th>{'UsersManager_Password'|translate}</th> + <th>{'UsersManager_Email'|translate}</th> + <th>{'UsersManager_Alias'|translate}</th> + <th>{'UsersManager_Token'|translate}</th> + <th>{'General_Edit'|translate}</th> + <th>{'General_Delete'|translate}</th> + </tr> + </thead> + + <tbody> + {foreach from=$users item=user key=i} + {if $user.login != 'anonymous'} + <tr class="editable" id="row{$i}"> + <td id="userLogin" class="editable">{$user.login}</td> + <td id="password" class="editable">-</td> + <td id="email" class="editable">{$user.email}</td> + <td id="alias" class="editable">{$user.alias}</td> + <td id="alias">{$user.token_auth}</td> + <td><img src='plugins/UsersManager/images/edit.png' class="edituser" id="row{$i}" href='#'></td> + <td><img src='plugins/UsersManager/images/remove.png' class="deleteuser" id="row{$i}" value="Delete"></td> + </tr> + {/if} + {/foreach} + </tbody> +</table> + +<div class="addrow"><a href="#"><img src='plugins/UsersManager/images/add.png'> {'UsersManager_AddUser'|translate}</a></div> +<script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script> + +{include file="CoreAdminHome/templates/footer.tpl"} diff --git a/plugins/VisitFrequency/index.tpl b/plugins/VisitFrequency/index.tpl index 87b32ce599..069a56d4df 100644 --- a/plugins/VisitFrequency/index.tpl +++ b/plugins/VisitFrequency/index.tpl @@ -1,11 +1,11 @@ -{postEvent name="template_headerVisitsFrequency"}
-<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script>
-
-<a name="evolutionGraph" graphId="VisitFrequencygetLastVisitsReturningGraph"></a>
-<h2>{'VisitFrequency_Evolution'|translate}</h2>
-{$graphEvolutionVisitFrequency}
-<br />
-
-{include file=VisitFrequency/sparklines.tpl}
-
-{postEvent name="template_footerVisitsFrequency"}
\ No newline at end of file +{postEvent name="template_headerVisitsFrequency"} +<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script> + +<a name="evolutionGraph" graphId="VisitFrequencygetLastVisitsReturningGraph"></a> +<h2>{'VisitFrequency_Evolution'|translate}</h2> +{$graphEvolutionVisitFrequency} +<br /> + +{include file=VisitFrequency/sparklines.tpl} + +{postEvent name="template_footerVisitsFrequency"} diff --git a/plugins/VisitFrequency/sparklines.tpl b/plugins/VisitFrequency/sparklines.tpl index 32f9cbfc84..bccbd06ea4 100644 --- a/plugins/VisitFrequency/sparklines.tpl +++ b/plugins/VisitFrequency/sparklines.tpl @@ -1,13 +1,13 @@ -
- <p>{sparkline src=$urlSparklineNbVisitsReturning}<span>
- {'VisitFrequency_ReturnVisits'|translate:"<strong>$nbVisitsReturning</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineNbActionsReturning}<span>
- {'VisitFrequency_ReturnActions'|translate:"<strong>$nbActionsReturning</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineMaxActionsReturning}<span>
- {'VisitFrequency_ReturnMaxActions'|translate:"<strong>$maxActionsReturning</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineSumVisitLengthReturning}<span>
- {assign var=sumtimeVisitLengthReturning value=$sumVisitLengthReturning|sumtime}
- {'VisitFrequency_ReturnTotalTime'|translate:"<strong>$sumtimeVisitLengthReturning</strong>"}</span></p>
- <p>{sparkline src=$urlSparklineBounceCountReturning}<span>
- {'VisitFrequency_ReturnBounces'|translate:"<strong>$bounceCountReturning</strong>"} </span></p>
-
\ No newline at end of file + + <p>{sparkline src=$urlSparklineNbVisitsReturning}<span> + {'VisitFrequency_ReturnVisits'|translate:"<strong>$nbVisitsReturning</strong>"}</span></p> + <p>{sparkline src=$urlSparklineNbActionsReturning}<span> + {'VisitFrequency_ReturnActions'|translate:"<strong>$nbActionsReturning</strong>"}</span></p> + <p>{sparkline src=$urlSparklineMaxActionsReturning}<span> + {'VisitFrequency_ReturnMaxActions'|translate:"<strong>$maxActionsReturning</strong>"}</span></p> + <p>{sparkline src=$urlSparklineSumVisitLengthReturning}<span> + {assign var=sumtimeVisitLengthReturning value=$sumVisitLengthReturning|sumtime} + {'VisitFrequency_ReturnTotalTime'|translate:"<strong>$sumtimeVisitLengthReturning</strong>"}</span></p> + <p>{sparkline src=$urlSparklineBounceCountReturning}<span> + {'VisitFrequency_ReturnBounces'|translate:"<strong>$bounceCountReturning</strong>"} </span></p> + diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php index 47dc678216..96f88a7c2b 100644 --- a/plugins/VisitTime/API.php +++ b/plugins/VisitTime/API.php @@ -55,4 +55,4 @@ class Piwik_VisitTime_API function Piwik_getTimeLabel($label) { return sprintf(Piwik_Translate('VisitTime_NHour'), $label); -}
\ No newline at end of file +} diff --git a/plugins/VisitTime/index.tpl b/plugins/VisitTime/index.tpl index 0f9379adac..82af946c7a 100644 --- a/plugins/VisitTime/index.tpl +++ b/plugins/VisitTime/index.tpl @@ -1,9 +1,9 @@ -<div id='leftcolumn'>
-<h2>{'VisitTime_LocalTime'|translate}</h2>
-{$dataTableVisitInformationPerLocalTime}
-</div>
-
-<div id='rightcolumn'>
-<h2>{'VisitTime_ServerTime'|translate}</h2>
-{$dataTableVisitInformationPerServerTime}
-</div>
+<div id='leftcolumn'> +<h2>{'VisitTime_LocalTime'|translate}</h2> +{$dataTableVisitInformationPerLocalTime} +</div> + +<div id='rightcolumn'> +<h2>{'VisitTime_ServerTime'|translate}</h2> +{$dataTableVisitInformationPerServerTime} +</div> diff --git a/plugins/VisitorInterest/index.tpl b/plugins/VisitorInterest/index.tpl index a9a0785822..f3855a44dc 100644 --- a/plugins/VisitorInterest/index.tpl +++ b/plugins/VisitorInterest/index.tpl @@ -1,7 +1,7 @@ -
-<h2>{'VisitorInterest_VisitsPerDuration'|translate}</h2>
-{$dataTableNumberOfVisitsPerVisitDuration}
-
-<h2>{'VisitorInterest_VisitsPerNbOfPages'|translate}</h2>
-{$dataTableNumberOfVisitsPerPage}
-
+ +<h2>{'VisitorInterest_VisitsPerDuration'|translate}</h2> +{$dataTableNumberOfVisitsPerVisitDuration} + +<h2>{'VisitorInterest_VisitsPerNbOfPages'|translate}</h2> +{$dataTableNumberOfVisitsPerPage} + diff --git a/plugins/VisitsSummary/index.tpl b/plugins/VisitsSummary/index.tpl index bacb8d761e..320efabea0 100644 --- a/plugins/VisitsSummary/index.tpl +++ b/plugins/VisitsSummary/index.tpl @@ -1,15 +1,15 @@ -<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script>
-
-<a name="evolutionGraph" graphId="VisitsSummarygetLastVisitsGraph"></a>
-<h2>{'VisitsSummary_Evolution'|translate:$period}</h2>
-{$graphEvolutionVisitsSummary}
-
-<h2>{'VisitsSummary_Report'|translate}</h2>
-{include file=VisitsSummary/sparklines.tpl}
-
-
-<br /><br /><br />
-<p style='color:lightgrey; size:0.8em;'>
-{'VisitsSummary_GenerateTime'|translate:$totalTimeGeneration:$totalNumberOfQueries}
-{if $totalNumberOfQueries != 0}, {'VisitsSummary_GenerateQueries'|translate:$totalNumberOfQueries}{/if}
-</p>
+<script type="text/javascript" src="plugins/CoreHome/templates/sparkline.js"></script> + +<a name="evolutionGraph" graphId="VisitsSummarygetLastVisitsGraph"></a> +<h2>{'VisitsSummary_Evolution'|translate:$period}</h2> +{$graphEvolutionVisitsSummary} + +<h2>{'VisitsSummary_Report'|translate}</h2> +{include file=VisitsSummary/sparklines.tpl} + + +<br /><br /><br /> +<p style='color:lightgrey; size:0.8em;'> +{'VisitsSummary_GenerateTime'|translate:$totalTimeGeneration:$totalNumberOfQueries} +{if $totalNumberOfQueries != 0}, {'VisitsSummary_GenerateQueries'|translate:$totalNumberOfQueries}{/if} +</p> diff --git a/plugins/VisitsSummary/sparklines.tpl b/plugins/VisitsSummary/sparklines.tpl index dcf779cb56..f3e5919a75 100644 --- a/plugins/VisitsSummary/sparklines.tpl +++ b/plugins/VisitsSummary/sparklines.tpl @@ -1,8 +1,8 @@ -<div>
-<p>{sparkline src=$urlSparklineNbVisits} <span>{'VisitsSummary_NbVisits'|translate:"<strong>$nbVisits</strong>"}</span></p>
-<p>{sparkline src=$urlSparklineNbUniqVisitors} <span>{'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}</span></p>
-<p>{sparkline src=$urlSparklineNbActions} <span>{'VisitsSummary_NbActions'|translate:"<strong>$nbActions</strong>"}</span></p>
-<p>{sparkline src=$urlSparklineSumVisitLength} <span>{assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"<strong>$sumtimeVisitLength</strong>"}</span></p>
-<p>{sparkline src=$urlSparklineMaxActions} <span>{'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"}</span></p>
-<p>{sparkline src=$urlSparklineBounceCount} <span>{'VisitsSummary_NbBounced'|translate:"<strong>$bounceCount</strong>"}</span></p>
-</div>
+<div> +<p>{sparkline src=$urlSparklineNbVisits} <span>{'VisitsSummary_NbVisits'|translate:"<strong>$nbVisits</strong>"}</span></p> +<p>{sparkline src=$urlSparklineNbUniqVisitors} <span>{'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}</span></p> +<p>{sparkline src=$urlSparklineNbActions} <span>{'VisitsSummary_NbActions'|translate:"<strong>$nbActions</strong>"}</span></p> +<p>{sparkline src=$urlSparklineSumVisitLength} <span>{assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"<strong>$sumtimeVisitLength</strong>"}</span></p> +<p>{sparkline src=$urlSparklineMaxActions} <span>{'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"}</span></p> +<p>{sparkline src=$urlSparklineBounceCount} <span>{'VisitsSummary_NbBounced'|translate:"<strong>$bounceCount</strong>"}</span></p> +</div> diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index 1905dd1a1c..bfc0738adc 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -74,4 +74,4 @@ class Piwik_Widgetize_Controller extends Piwik_Dashboard_Controller $view->content = $outputDataTable; echo $view->render(); } -}
\ No newline at end of file +} diff --git a/plugins/Widgetize/templates/iframe.tpl b/plugins/Widgetize/templates/iframe.tpl index c008a3701e..0cb5f23cf9 100644 --- a/plugins/Widgetize/templates/iframe.tpl +++ b/plugins/Widgetize/templates/iframe.tpl @@ -1,25 +1,25 @@ -<html>
-<body>
-
-{loadJavascriptTranslations plugins='CoreHome'}
-
-{include file="CoreHome/templates/js_global_variables.tpl"}
-<script type="text/javascript" src="libs/jquery/jquery.js"></script>
-<script type="text/javascript" src="libs/javascript/sprintf.js"></script>
-<script type="text/javascript" src="themes/default/common.js"></script>
-<script type="text/javascript" src="libs/jquery/jquery.dimensions.js"></script>
-<script type="text/javascript" src="libs/jquery/tooltip/jquery.tooltip.js"></script>
-<script type="text/javascript" src="libs/jquery/truncate/jquery.truncate.js"></script>
-<script type="text/javascript" src="libs/jquery/jquery.scrollTo.js"></script>
-
-<script type="text/javascript" src="libs/swfobject/swfobject.js"></script>
-
-<script type="text/javascript" src="plugins/CoreHome/templates/datatable.js"></script>
-<link rel="stylesheet" href="plugins/CoreHome/templates/datatable.css">
-
-<div class="widgetDiv">
-{$content}
-</div>
-
-</body>
-</html>
+<html> +<body> + +{loadJavascriptTranslations plugins='CoreHome'} + +{include file="CoreHome/templates/js_global_variables.tpl"} +<script type="text/javascript" src="libs/jquery/jquery.js"></script> +<script type="text/javascript" src="libs/javascript/sprintf.js"></script> +<script type="text/javascript" src="themes/default/common.js"></script> +<script type="text/javascript" src="libs/jquery/jquery.dimensions.js"></script> +<script type="text/javascript" src="libs/jquery/tooltip/jquery.tooltip.js"></script> +<script type="text/javascript" src="libs/jquery/truncate/jquery.truncate.js"></script> +<script type="text/javascript" src="libs/jquery/jquery.scrollTo.js"></script> + +<script type="text/javascript" src="libs/swfobject/swfobject.js"></script> + +<script type="text/javascript" src="plugins/CoreHome/templates/datatable.js"></script> +<link rel="stylesheet" href="plugins/CoreHome/templates/datatable.css"> + +<div class="widgetDiv"> +{$content} +</div> + +</body> +</html> diff --git a/plugins/Widgetize/templates/index.tpl b/plugins/Widgetize/templates/index.tpl index 8ffabb6dfb..8254bf9fef 100644 --- a/plugins/Widgetize/templates/index.tpl +++ b/plugins/Widgetize/templates/index.tpl @@ -114,4 +114,4 @@ If you want your widgets to be viewable by everybody, you first have to set the <div class="menuClear"> </div> </div> <div id='iframeDivToExport' style='display:none;'></div> -</div>
\ No newline at end of file +</div> diff --git a/plugins/Widgetize/templates/js.tpl b/plugins/Widgetize/templates/js.tpl index dc43825377..50284a9591 100644 --- a/plugins/Widgetize/templates/js.tpl +++ b/plugins/Widgetize/templates/js.tpl @@ -1,19 +1,19 @@ -{loadJavascriptTranslations noHtml=1 plugins='CoreHome'}
-
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/swfobject/swfobject.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/javascript/sprintf.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/jquery.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}themes/default/common.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/jquery.dimensions.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/tooltip/jquery.tooltip.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/truncate/jquery.truncate.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}plugins/CoreHome/templates/datatable.js"></scr'+'ipt>');
-document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/ui.mouse.js"></scr'+'ipt>');
-
-document.write('<link rel="stylesheet" href="{$piwikUrl}themes/default/common.css">');
-document.write('<link rel="stylesheet" href="{$piwikUrl}plugins/CoreHome/templates/styles.css">');
-document.write('<link rel="stylesheet" href="{$piwikUrl}plugins/CoreHome/templates/datatable.css">');
-
-var content = '{$content|escape:'javascript'}';
-document.write('<scr'+'ipt language="javascript">document.write(content)</scr'+'ipt>');
-
+{loadJavascriptTranslations noHtml=1 plugins='CoreHome'} + +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/swfobject/swfobject.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/javascript/sprintf.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/jquery.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}themes/default/common.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/jquery.dimensions.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/tooltip/jquery.tooltip.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/truncate/jquery.truncate.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}plugins/CoreHome/templates/datatable.js"></scr'+'ipt>'); +document.write('<scr'+'ipt language="javascript" src="{$piwikUrl}libs/jquery/ui.mouse.js"></scr'+'ipt>'); + +document.write('<link rel="stylesheet" href="{$piwikUrl}themes/default/common.css">'); +document.write('<link rel="stylesheet" href="{$piwikUrl}plugins/CoreHome/templates/styles.css">'); +document.write('<link rel="stylesheet" href="{$piwikUrl}plugins/CoreHome/templates/datatable.css">'); + +var content = '{$content|escape:'javascript'}'; +document.write('<scr'+'ipt language="javascript">document.write(content)</scr'+'ipt>'); + diff --git a/plugins/Widgetize/templates/test_jsinclude.tpl b/plugins/Widgetize/templates/test_jsinclude.tpl index 111893fe3f..b2416acee3 100644 --- a/plugins/Widgetize/templates/test_jsinclude.tpl +++ b/plugins/Widgetize/templates/test_jsinclude.tpl @@ -17,4 +17,4 @@ <noscript>Powered by <a href="http://piwik.org">Piwik</a></div></noscript> <p>This text is after the JS INCLUDE 2</p> </body> -</html>
\ No newline at end of file +</html> diff --git a/plugins/Widgetize/templates/test_jsinclude2.tpl b/plugins/Widgetize/templates/test_jsinclude2.tpl index 01220310fc..fb5d288e59 100644 --- a/plugins/Widgetize/templates/test_jsinclude2.tpl +++ b/plugins/Widgetize/templates/test_jsinclude2.tpl @@ -24,4 +24,4 @@ <p>This text is after the JS INCLUDE</p> </body> -</html>
\ No newline at end of file +</html> |