changes

bartcc · Mar 19, 2017 · 965cb17 · 965cb17
1 parent baa2b4f
commit 965cb17
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 9 deletions.
diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
@@ -58,6 +58,7 @@
 define('BASE_URL', Configure::read('App.baseUrl'));
 define('WEB_URL', '/' . APP_DIR . '/' . WEBROOT_DIR);
 define('UPLOADS', ROOT . DS . 'uploads');
+define('MYSQLCONFIG', ROOT . DS . 'mysqlconf');
 define('MYSQLUPLOAD', ROOT . DS . 'mysql');
 if (!defined('MYSQL_CMD_PATH')) {
   $a = explode('.', DIR_HOST);

diff --git a/app/controllers/mysql_controller.php b/app/controllers/mysql_controller.php
@@ -40,9 +40,9 @@ function mysql($action, $args = '') {
       $op = `$cmd`;
       return $op;
     }
-    //$path = '/var/www/vhosts/webpremiere.de/mysql_backup/';
-//    $cmd = sprintf('%1s -uaxel -pkakadax -h localhost todos_backbone %2s /var/www/vhosts/webpremiere.de/mysqlÇ/file.sql 2>&1', $postfix, $io);
-    $cmd = sprintf('%1s -uaxel -pkakadax -h localhost todos_backbone %2s ' . MYSQLUPLOAD . '/file.sql 2>&1', $postfix, $io);
+    $this->log(ROOT, LOG_DEBUG);
+    $cmd = sprintf('%1s --defaults-extra-file='.MYSQLCONFIG.'/my.cnf todos_backbone %2s ' . MYSQLUPLOAD . '/file.sql 2>&1', $postfix, $io);
+//    $cmd = sprintf('%1s --login-path=local todos_backbone %2s ' . MYSQLUPLOAD . '/file.sql 2>&1', $postfix, $io);
     $op = `$cmd`;
     return $op;
   }

diff --git a/app/newhtml.html b/app/newhtml.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<!--
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+-->
+<html>
+  <head>
+    <title>TODO supply a title</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  </head>
+  <body>
+    <div>TODO write content</div>
+  </body>
+</html>
diff --git a/app/views/pages/home.ctp b/app/views/pages/home.ctp
@@ -25,13 +25,35 @@ endif;
     <div class="inner">
       <h1>Sweet...</h1>
       <p>
-        Choose your App
-      </p>
-      <p class="download-info">
-        <a href="/todos_app" class="btn btn-primary btn-large" type="submit">Backbone's Todos</a>
-        <a href="/tasks_app" class="btn btn-info btn-large" type="submit">Spine's Todos</a>
-        <a href="http://gap.<?php echo HOST; ?>.<?php echo TOPLEVEL; ?>" class="btn btn-large" type="submit">More...</a>
+        Pick your App
       </p>
+			<table class="download-info button-wrap">
+						<tr style="text-align: center">
+								<td>
+										<a href="/todos_app" class="btn btn-primary btn-large" type="submit">Backbone's Todos</a>
+										<i class="info">Todos App (Backbone.js)</i>
+								</td>
+								<td>
+										<a href="/tasks_app" class="btn btn-info btn-large" type="submit">Spine's Todos</a>
+										<i class="info">Todos App (Spine.js)</i>
+								</td>
+								<td>
+										<a href="http://data.<?php echo HOST; ?>.<?php echo TOPLEVEL; ?>" class="btn btn-warning btn-large" type="submit"><span itemprop="name">Datastore</span></a>
+										<i class="info">Store Data</i>
+								</td>
+						</tr>
+						<tr style="text-align: center">
+								<td>
+
+								</td>
+								<td>
+
+								</td>
+								<td>
+										<a href="http://gap.<?php echo HOST; ?>.<?php echo TOPLEVEL; ?>" class="btn btn-large" type="submit">More...</a>
+								</td>
+						</tr>
+				</table>
     </div>
   </header>
 </div>
diff --git a/app/webroot/css/app.css b/app/webroot/css/app.css
@@ -53,6 +53,13 @@ hr.soften {
   border: 0;
 }
 
+.button-wrap td {
+		padding: 5px 10px;
+}
+i.info {
+    display: block;
+    color: #999999;
+}
 
 /* Jumbotrons
 -------------------------------------------------- */
@@ -74,10 +81,15 @@ hr.soften {
   font-weight: normal;
   padding: 14px 24px;
   margin-right: 10px;
+	width: 250px;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
           border-radius: 6px;
 }
+.jumbotron table {
+  margin: 0 auto;
+  text-align: center;
+}
 
 /* Masthead (docs home) */
 .masthead {

diff --git a/mysqlconf/my.cnf b/mysqlconf/my.cnf
@@ -0,0 +1,4 @@
+[client]
+host     = localhost
+user     = axel
+password = kakadax