Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2008-08-19 05:21:22 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2008-08-19 05:21:22 +0400
commit246e8c4c843a2ea81fed792195e489dd2e78beb3 (patch)
tree78fcef543146d97ee78ba7ec03c47b065e9e3245 /plugins/SitesManager/templates
parentb0260b6ffa5de9e095f9ce394fc6439f46dc2947 (diff)
Fixed the menu is now fully translatable! ouf
Fixed javascript handling of translations: we can now load translations strings in several places in the templates, they will all be concatenated into one bigger object Fixed handling japanese error messages in API with correct charset Finished (hopefuly?) to make all strings translatable. Added colored logo now in login screen All templates now defined the dates necessary to build the calendar, as we notice that most pages want to show the calendar. Added destructor to LogStats/Db.php so that plugins don't have to call disconnect() on the object Made JS tag smaller Improved templates structuring, refactored CSS, etc. still lots to do in this area, if you wanna help?
Diffstat (limited to 'plugins/SitesManager/templates')
-rw-r--r--plugins/SitesManager/templates/DisplayJavascriptCode.tpl4
-rw-r--r--plugins/SitesManager/templates/SitesManager.js3
-rw-r--r--plugins/SitesManager/templates/SitesManager.tpl12
3 files changed, 8 insertions, 11 deletions
diff --git a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
index ada9bf8dff..784557308c 100644
--- a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
+++ b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
@@ -24,6 +24,4 @@ code {
<p>{'SitesManager_JsCodeHelp'|translate}:</p>
-<code>
-{$jsTag}
-</code>
+<code>{$jsTag}</code>
diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js
index bac60a6e67..b8452bcdc5 100644
--- a/plugins/SitesManager/templates/SitesManager.js
+++ b/plugins/SitesManager/templates/SitesManager.js
@@ -15,7 +15,6 @@ function getDeleteSiteAJAX( idSite )
var ajaxRequest = getStandardAjaxConf();
toggleAjaxLoading();
- // prepare the API parameters to update the user
var parameters = new Object;
parameters.module = 'API';
parameters.format = 'json';
@@ -33,9 +32,7 @@ function getAddSiteAJAX( row )
var ajaxRequest = getStandardAjaxConf();
toggleAjaxLoading();
- // prepare the API parameters to add the user
var parameters = new Object;
-
var siteName = $(row).find('input[@id=siteadd_name]').val();
var urls = $(row).find('textarea[@id=siteadd_urls]').val();
var urls = urls.trim().split("\n");
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index e4586aa128..18d0372ddb 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -10,20 +10,22 @@
.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>Websites Management</h2>
-<p>Your Web Analytics reports need Websites! Add, update, delete Websites, and show the Javascript to insert in your pages.</p>
+<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>
@@ -56,6 +58,6 @@
</tbody>
</table>
- <span class="addRowSite"><img src='plugins/UsersManager/images/add.png' alt="" />{'SitesManager_AddSite'|translate}</span>
+ <div class="addRowSite"><a href="#"><img src='plugins/UsersManager/images/add.png' alt="" /> {'SitesManager_AddSite'|translate}</a></div>
{/if}