[Piwik-svn] r204 - in trunk/plugins: Home/templates Widgetize Widgetize/templates

svnmaster at piwik.org svnmaster at piwik.org
Sun Jan 20 02:10:33 CET 2008 

Author: matt
Date: 2008-01-20 02:10:33 +0100 (Sun, 20 Jan 2008)
New Revision: 204

Added:
   trunk/plugins/Widgetize/templates/js.tpl
Removed:
   trunk/plugins/Widgetize/templates/js_include.tpl
Modified:
   trunk/plugins/Home/templates/datatable.js
   trunk/plugins/Home/templates/datatable.tpl
   trunk/plugins/Home/templates/datatable_footer.tpl
   trunk/plugins/Widgetize/Controller.php
   trunk/plugins/Widgetize/templates/test_jsinclude.tpl
Log:
- include any datatable from piwik in your webpage using a javascript include

Modified: trunk/plugins/Home/templates/datatable.js
===================================================================
--- trunk/plugins/Home/templates/datatable.js	2008-01-20 00:20:22 UTC (rev 203)
+++ trunk/plugins/Home/templates/datatable.js	2008-01-20 01:10:33 UTC (rev 204)
@@ -257,7 +257,7 @@
 			// adding an image and the class columnSorted to the TD
 			$(".sortable[@id='"+self.param.filter_sort_column+"']", domElem)
 				.addClass('columnSorted')
-				.append('<img width="'+imageSortWidth+'" height="'+imageSortHeight+'" src="themes/default/images/sort'+ self.param.filter_sort_order+'.png">');
+				.append('<img width="'+imageSortWidth+'" height="'+imageSortHeight+'" src="themes/default/images/sort'+ self.param.filter_sort_order+'.png" />');
 		}
 	},
 	
@@ -567,7 +567,7 @@
 					<tr>\
 						<td colspan="'+numberOfColumns+'">\
 							<div id="'+divIdToReplaceWithSubTable+'">\
-								<span id="loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif"> Loading...</span>\
+								<span id="loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif" /> Loading...</span>\
 							</div>\
 						</td>\
 					</tr>\
@@ -765,7 +765,7 @@
 			$(domElem).after( '\
 			<tr id="'+divIdToReplaceWithSubTable+'">\
 				<td colspan="'+numberOfColumns+'">\
-						<span id="loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif"> Loading...</span>\
+						<span id="loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif" /> Loading...</span>\
 				</td>\
 			</tr>\
 			');

Modified: trunk/plugins/Home/templates/datatable.tpl
===================================================================
--- trunk/plugins/Home/templates/datatable.tpl	2008-01-20 00:20:22 UTC (rev 203)
+++ trunk/plugins/Home/templates/datatable.tpl	2008-01-20 01:10:33 UTC (rev 204)
@@ -10,7 +10,7 @@
 		<thead>
 		<tr>
 		{foreach from=$dataTableColumns item=column}
-			<th class="sortable" id="{$column.id}">{$column.name}</td>
+			<th class="sortable" id="{$column.id}">{$column.name}</th>
 		{/foreach}
 		</tr>
 		</thead>

Modified: trunk/plugins/Home/templates/datatable_footer.tpl
===================================================================
--- trunk/plugins/Home/templates/datatable_footer.tpl	2008-01-20 00:20:22 UTC (rev 203)
+++ trunk/plugins/Home/templates/datatable_footer.tpl	2008-01-20 01:10:33 UTC (rev 204)
@@ -2,14 +2,14 @@
 <span id="dataTableExcludeLowPopulation"></span>
 
 <span id="dataTableSearchPattern">
-	<input id="keyword" type="text" length="15">
-	<input type="submit" value="Search">
+	<input id="keyword" type="text" length="15" />
+	<input type="submit" value="Search" />
 </span>
 
 <span id="dataTablePages"></span>
 <span id="dataTablePrevious">&lt; Previous</span>
 <span id="dataTableNext">Next &gt;</span>
-<span id="loadingDataTable"><img src="themes/default/images/loading-blue.gif"> Loading...</span>
+<span id="loadingDataTable"><img src="themes/default/images/loading-blue.gif" /> Loading...</span>
 
 </div>
 	
@@ -17,7 +17,7 @@
 <span id="exportDataTable" style="display:none">
 	
 	<span id="exportToFormat">
-		<img  width="16" height="16" src="themes/default/images/export.png">
+		<img width="16" height="16" src="themes/default/images/export.png" />
 		<span id="linksExportToFormat" style="display:none"> 
 			<a target="_blank" class="exportToFormat" methodToCall="{$method}" format="CSV" filter_limit="100">CSV</a> | 
 			<a target="_blank" class="exportToFormat" methodToCall="{$method}" format="XML" filter_limit="100">XML</a> |
@@ -25,9 +25,8 @@
 			<a target="_blank" class="exportToFormat" methodToCall="{$method}" format="PHP" filter_limit="100">Php</a>
 		</span>
 	</span>
-	
-	<a class="viewDataTable" format="table"><img width="16" height="16" src="themes/default/images/table.png" title="Table"></a>
-	<a class="viewDataTable" format="cloud"><img width="16" height="16" src="themes/default/images/tagcloud.png" title="Tag Cloud"></a>
-	<a class="viewDataTable" format="graphVerticalBar"><img width="16" height="16" src="themes/default/images/chart_bar.png" title="Vertical bar graph"></a>
-	<a class="viewDataTable" format="graphPie"><img width="16" height="16" src="themes/default/images/chart_pie.png" title="Pie chart"></a>
+	<a class="viewDataTable" format="table"><img width="16" height="16" src="themes/default/images/table.png" title="Table" /></a>
+	<a class="viewDataTable" format="cloud"><img width="16" height="16" src="themes/default/images/tagcloud.png" title="Tag Cloud" /></a>
+	<a class="viewDataTable" format="graphVerticalBar"><img width="16" height="16" src="themes/default/images/chart_bar.png" title="Vertical bar graph" /></a>
+	<a class="viewDataTable" format="graphPie"><img width="16" height="16" src="themes/default/images/chart_pie.png" title="Pie chart" /></a>
 </span>

Modified: trunk/plugins/Widgetize/Controller.php
===================================================================
--- trunk/plugins/Widgetize/Controller.php	2008-01-20 00:20:22 UTC (rev 203)
+++ trunk/plugins/Widgetize/Controller.php	2008-01-20 01:10:33 UTC (rev 204)
@@ -36,10 +36,35 @@
 	function testJsInclude()
 	{
 		$view = new Piwik_View('Widgetize/templates/test_jsinclude.tpl');
+		$view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=Home&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
+		$view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=Home&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday&viewDataTable=cloud&showDataTableFooter=0';
 		echo $view->render();
 	}
 	
-	// the code inside the IFRAME
+	
+	// the code loaded by the script src=
+	function js()
+	{
+		$controllerName = Piwik_Common::getRequestVar('moduleToWidgetize');
+		$actionName = Piwik_Common::getRequestVar('actionToWidgetize');
+		$parameters = array ( $fetch = true );
+		$outputDataTable='';
+		
+		$outputDataTable = Piwik_FrontController::getInstance()->dispatch( $controllerName, $actionName, $parameters);
+		
+		$view = new Piwik_View('Widgetize/templates/js.tpl');
+		$content = $outputDataTable;
+//		$content = str_replace(
+//								array( "<script",    "</script",   "'", "\n", "\t"), 
+//								array( "<scr'+'ipt", "<\/scr'+'ipt",  "\'", '', ''), 
+//								$outputDataTable
+//							);
+		
+//		echo $content;exit;
+		$view->content = $content;
+		echo $view->render();
+	}
+	// the code loaded by the frame src=
 	function iframe()
 	{		
 		$controllerName = Piwik_Common::getRequestVar('moduleToWidgetize');

Added: trunk/plugins/Widgetize/templates/js.tpl
===================================================================
--- trunk/plugins/Widgetize/templates/js.tpl	                        (rev 0)
+++ trunk/plugins/Widgetize/templates/js.tpl	2008-01-20 01:10:33 UTC (rev 204)
@@ -0,0 +1,12 @@
+document.write('<scr'+'ipt language="javascript" src="libs/jquery/jquery.js"><\/scr'+'ipt>');
+document.write('<scr'+'ipt language="javascript" src="themes/default/common.js"><\/scr'+'ipt>');
+document.write('<scr'+'ipt language="javascript" src="libs/jquery/jquery.dimensions.js"><\/scr'+'ipt>');
+document.write('<scr'+'ipt language="javascript" src="libs/jquery/tooltip/jquery.tooltip.js"><\/scr'+'ipt>');
+document.write('<scr'+'ipt language="javascript" src="libs/jquery/truncate/jquery.truncate.js"><\/scr'+'ipt>');
+document.write('<scr'+'ipt language="javascript" src="libs/swfobject/swfobject.js"><\/scr'+'ipt>');
+document.write('<scr'+'ipt language="javascript" src="plugins/Home/templates/datatable.js"><\/scr'+'ipt>');
+document.write('<link rel="stylesheet" href="libs/jquery/tooltip/jquery.tooltip.css">');
+document.write('<link rel="stylesheet" href="plugins/Home/templates/datatable.css">');
+
+var content = '{$content|escape:'javascript'}';
+document.write(content);
\ No newline at end of file

Deleted: trunk/plugins/Widgetize/templates/js_include.tpl
===================================================================
--- trunk/plugins/Widgetize/templates/js_include.tpl	2008-01-20 00:20:22 UTC (rev 203)
+++ trunk/plugins/Widgetize/templates/js_include.tpl	2008-01-20 01:10:33 UTC (rev 204)
@@ -1,10 +0,0 @@
-<html>
-<body>
-<h2>Test getCountry table in a JS include</h2>
-
-<noscript>Powered by <a href="http://piwik.org">Piwik</a></div></noscript>
-
-<p>This test is after the JS INCLUDE</p>
-
-</body>
-</html>
\ No newline at end of file

Modified: trunk/plugins/Widgetize/templates/test_jsinclude.tpl
===================================================================
--- trunk/plugins/Widgetize/templates/test_jsinclude.tpl	2008-01-20 00:20:22 UTC (rev 203)
+++ trunk/plugins/Widgetize/templates/test_jsinclude.tpl	2008-01-20 01:10:33 UTC (rev 204)
@@ -1,10 +1,26 @@
 <html>
 <body>
-<h2>Test table in a js include</h2>
-<code>not there yet</code>
+<h2>Test getCountry table in a JS include</h2>
+
+<script type="text/javascript" src="{$url1}"></script>
 <noscript>Powered by <a href="http://piwik.org">Piwik</a></div></noscript>
 
-<p>This text is after the Js include</p>
+{literal}
+<style>
+table.dataTable td {
+	background-color:red;
+}
+</style>
+{/literal}
+<p>This test is after the JS INCLUDE</p>
 
+
+<h2>Test tag cloud in a JS include</h2>
+
+<script type="text/javascript" src="{$url2}"></script>
+<noscript>Powered by <a href="http://piwik.org">Piwik</a></div></noscript>
+
+<p>This test is after the JS INCLUDE</p>
+
 </body>
 </html>
\ No newline at end of file

More information about the Piwik-svn mailing list