Renamed the data model into IdexView

dspasic · dspasic · commit 6a1eaeeb06fc · 2015-07-25T19:06:41.000+02:00
diff --git a/share/templates/layout.php b/share/templates/layout.php
@@ -186,12 +186,12 @@ function toggleVisible(head, row) {
             }
         }
     </script>
-    <title><?php echo $dataModel->getPageTitle(); ?></title>
+    <title><?php echo $view->pageTitle(); ?></title>
 </head>
 
 <body>
 <div id="container">
-    <h1><?php echo $dataModel->getPageTitle(); ?></h1>
+    <h1><?php echo $view->pageTitle(); ?></h1>
 
     <div class="tabs">
 
@@ -200,7 +200,7 @@ function toggleVisible(head, row) {
             <label for="tab-status">Status</label>
             <div class="content">
                 <table>
-                    <?php echo $dataModel->getStatusDataRows(); ?>
+                    <?php echo $view->getStatusDataRows(); ?>
                 </table>
             </div>
         </div>
@@ -210,7 +210,7 @@ function toggleVisible(head, row) {
             <label for="tab-config">Configuration</label>
             <div class="content">
                 <table>
-                    <?php foreach ($dataModel->getSettings() as $row): ?>
+                    <?php foreach ($view->getSettings() as $row): ?>
                         <tr>
                             <th><?php echo $row['config'] ?></th>
                             <td><?php echo $row['value'] ?></td>
@@ -222,15 +222,15 @@ function toggleVisible(head, row) {
 
         <div class="tab">
             <input type="radio" id="tab-scripts" name="tab-group-1">
-            <label for="tab-scripts">Scripts (<?php echo $dataModel->getScriptStatusCount(); ?>)</label>
+            <label for="tab-scripts">Scripts (<?php echo $view->getScriptStatusCount(); ?>)</label>
             <div class="content">
                 <table style="font-size:0.8em;">
                     <tr>
                         <th width="10%">Hits</th>
                         <th width="20%">Memory</th>
                         <th width="70%">Path</th>
                     </tr>
-                    <?php echo $dataModel->getScriptStatusRows(); ?>
+                    <?php echo $view->getScriptStatusRows(); ?>
                 </table>
             </div>
         </div>
@@ -259,7 +259,7 @@ function toggleVisible(head, row) {
 <div id="partition"></div>
 
 <script>
-    var dataset = <?php echo $dataModel->getGraphDataSetJson(); ?>;
+    var dataset = <?php echo $view->getGraphDataSetJson(); ?>;
 
     var width = 400,
         height = 400,
@@ -293,10 +293,10 @@ function toggleVisible(head, row) {
     function set_text(t) {
         if (t === "memory") {
             d3.select("#stats").html(
-                "<table><tr><th style='background:#B41F1F;'>Used</th><td><?php echo $dataModel->getHumanUsedMemory()?></td></tr>"+
-                "<tr><th style='background:#1FB437;'>Free</th><td><?php echo $dataModel->getHumanFreeMemory()?></td></tr>"+
-                "<tr><th style='background:#ff7f0e;' rowspan=\"2\">Wasted</th><td><?php echo $dataModel->getHumanWastedMemory()?></td></tr>"+
-                "<tr><td><?php echo $dataModel->getWastedMemoryPercentage()?>%</td></tr></table>"
+                "<table><tr><th style='background:#B41F1F;'>Used</th><td><?php echo $view->getHumanUsedMemory()?></td></tr>"+
+                "<tr><th style='background:#1FB437;'>Free</th><td><?php echo $view->getHumanFreeMemory()?></td></tr>"+
+                "<tr><th style='background:#ff7f0e;' rowspan=\"2\">Wasted</th><td><?php echo $view->getHumanWastedMemory()?></td></tr>"+
+                "<tr><td><?php echo $view->getWastedMemoryPercentage()?>%</td></tr></table>"
             );
         } else if (t === "keys") {
             d3.select("#stats").html(
@@ -375,7 +375,7 @@ function format_value(value) {
     var partition = d3.layout.partition()
         .value(function(d) { return d.size; });
 
-    root = JSON.parse('<?php echo json_encode($dataModel->getD3Scripts()); ?>');
+    root = JSON.parse('<?php echo json_encode($view->getD3Scripts()); ?>');
 
     var g = vis.selectAll("g")
         .data(partition.nodes(root))
diff --git a/web/index.php b/web/index.php
@@ -6,7 +6,7 @@
     die("Module Zend OPcache is not loaded");
 }
 
-class OpCacheDataModel
+class IndexView
 {
     private $configuration;
     private $status;
@@ -18,7 +18,7 @@ public function __construct()
         $this->status = opcache_get_status();
     }
 
-    public function getPageTitle()
+    public function pageTitle()
     {
         return 'PHP ' . PHP_VERSION . " with OpCache {$this->configuration['version']['version']}";
     }
@@ -277,6 +277,6 @@ private function _arrayPset(&$array, $key, $value)
 
 }
 
-$dataModel = new OpCacheDataModel();
+$view = new IndexView();
 
 include dirname(__DIR__) . '/share/templates/layout.php';

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`die("Module Zend OPcache is not loaded");`
`7`	`7`	`}`
`8`	`8`
`9`		`-class OpCacheDataModel`
	`9`	`+class IndexView`
`10`	`10`	`{`
`11`	`11`	`private $configuration;`
`12`	`12`	`private $status;`
`@@ -18,7 +18,7 @@ public function __construct()`
`18`	`18`	`$this->status = opcache_get_status();`
`19`	`19`	`}`
`20`	`20`
`21`		`- public function getPageTitle()`
	`21`	`+ public function pageTitle()`
`22`	`22`	`{`
`23`	`23`	`return 'PHP ' . PHP_VERSION . " with OpCache {$this->configuration['version']['version']}";`
`24`	`24`	`}`
`@@ -277,6 +277,6 @@ private function _arrayPset(&$array, $key, $value)`
`277`	`277`
`278`	`278`	`}`
`279`	`279`
`280`		`-$dataModel = new OpCacheDataModel();`
	`280`	`+$view = new IndexView();`
`281`	`281`
`282`	`282`	`include dirname(__DIR__) . '/share/templates/layout.php';`