coldiary
/
Vitrine
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

prepare push to coldiary

Coldiary 4 years ago
parent
4e8698da73
commit
2e1507a88a
6 changed files with 63 additions and 6 deletions
Split View Show Diff Stats
  1. 27
    0
      .gitignore
  2. 2
    1
      app/Controller/AppController.php
  3. 24
    0
      app/View/Helper/TextExtendedHelper.php
  4. 0
    2
      app/View/Layouts/default.ctp
  5. 10
    1
      app/View/Pages/home.ctp
  6. 0
    2
      app/tmp/cache/persistent/app_cake_core_file_map

+ 27
- 0
.gitignore View File 

@@ -0,0 +1,27 @@
1 
+# User specific & automatically generated files #
2 
+#################################################
3 
+/app/tmp
4 
+/app/Plugin
5 
+/lib/Cake/Console/Templates/skel/tmp/
6 
+/plugins
7 
+/vendor
8 
+/build
9 
+/dist
10 
+/tags
11 
+*.mo
12 
+
13 
+# IDE and editor specific files #
14 
+#################################
15 
+/nbproject
16 
+.idea
17 
+
18 
+# OS generated files #
19 
+######################
20 
+.DS_Store
21 
+.DS_Store?
22 
+._*
23 
+.Spotlight-V100
24 
+.Trashes
25 
+Icon?
26 
+ehthumbs.db
27 
+Thumbs.db

+ 2
- 1
app/Controller/AppController.php View File 

@@ -23,6 +23,7 @@ App::uses('Controller', 'Controller');
23 23 
  */
24 24 
 class AppController extends Controller {
25 25 
 	public $helpers = array(
26 
-		'Html' => array('className' => 'HtmlExt')
26 
+		'Html' => array('className' => 'HtmlExt'),
27 
+		'Text' => array('className' => 'TextExtended')
27 28 
 	);
28 29 
 }

+ 24
- 0
app/View/Helper/TextExtendedHelper.php View File 

@@ -0,0 +1,24 @@
1 
+<?php
2 
+
3 
+App::uses('TextHelper', 'View/Helper/');
4 
+
5 
+class TextExtendedHelper extends TextHelper {
6 
+
7 
+	private $embedRegexp = array(
8 
+		"/<a href=\"(?:http:\\/\\/|https:\\/\\/)?(?:www\\.)?(?:youtube\\.com|youtu\\.be)\\/(?:watch\\?v=)?([^\\&\"]+).*\".*>.*<\\/a>/",
9 
+		"/<a href=\"(?:http:\\/\\/|https:\\/\\/)?(?:www\\.)?(?:vimeo\\.com)\\/([^\\&\"]+).*\".*>.*<\\/a>/",
10 
+		"/<a href=\"(?:http:\\/\\/|https:\\/\\/)?(?:www\\.)?(?:dailymotion\\.com|dai\\.ly)\\/([^\\&\"]+).*\".*>.*<\\/a>/"
11 
+	);
12 
+
13 
+	private $embedIframe = array(
14 
+		'<center><iframe width="480" height="270" src="http://www.youtube.com/embed/$1?modestbranding=1&rel=0&wmode=transparent&theme=light&color=white" frameborder="0" allowfullscreen></iframe></center>',
15 
+		'<center><iframe src="//player.vimeo.com/video/$1" width="480" height="270" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe></center>',
16 
+		'<center><iframe frameborder="0" width="480" height="270" src="http://www.dailymotion.com/embed/video/$1?logo=0&foreground=ffffff&highlight=1bb4c6&background=000000" allowfullscreen></iframe></center>'
17 
+	);
18 
+
19 
+	public function autoLink($text, $htmlOptions = array()) {
20 
+		$text = parent::autoLink($text, $htmlOptions);
21 
+		return preg_replace($this->embedRegexp, $this->embedIframe, $text);
22 
+	}
23 
+
24 
+}

+ 0
- 2
app/View/Layouts/default.ctp View File 

@@ -1,7 +1,6 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html>
3 3 
 <head>
4 
-	<?php echo $this->Html->charset(); ?>
5 4 
 	<title>BRAND TITLE</title>
6 5 
 	<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
7 6 
 	<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
 
@@ -12,7 +11,6 @@
12 11 
 	<script type="text/javascript" src="js/script.js"></script>
13 12 
 	<?php
14 13 
 	$action = $this->request->params['action'];
15 
-	echo $this->Html->meta('icon');
16 14 
 	echo $this->fetch('meta');
17 15 
 	echo $this->fetch('css');
18 16 
 	echo $this->fetch('script');

+ 10
- 1
app/View/Pages/home.ctp View File 

@@ -3,4 +3,13 @@ tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
3 3 
 quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
4 4 
 consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
5 5 
 cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
6 
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
6 
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
7 
+<?php echo $this->Text->autoLink("
8 
+
9 
+https://www.youtube.com/watch?v=l1IVZpk_rVo
10 
+
11 
+https://vimeo.com/146534283
12 
+
13 
+http://www.dailymotion.com/x3bfy5r
14 
+
15 
+"); ?>

+ 0
- 2
app/tmp/cache/persistent/app_cake_core_file_map View File 

@@ -1,2 +0,0 @@
1 
-1447338679
2 
-a:45:{s:9:"Configure";s:74:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Core/Configure.php";s:4:"Hash";s:72:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Utility/Hash.php";s:5:"Cache";s:71:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Cache/Cache.php";s:10:"FileEngine";s:83:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Cache/Engine/FileEngine.php";s:11:"CacheEngine";s:77:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Cache/CacheEngine.php";s:9:"Inflector";s:77:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Utility/Inflector.php";s:12:"ErrorHandler";s:78:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Error/ErrorHandler.php";s:7:"CakeLog";s:71:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Log/CakeLog.php";s:19:"LogEngineCollection";s:83:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Log/LogEngineCollection.php";s:16:"ObjectCollection";s:84:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Utility/ObjectCollection.php";s:7:"FileLog";s:78:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Log/Engine/FileLog.php";s:7:"BaseLog";s:78:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Log/Engine/BaseLog.php";s:16:"CakeLogInterface";s:80:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Log/CakeLogInterface.php";s:8:"Debugger";s:76:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Utility/Debugger.php";s:8:"CakeText";s:76:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Utility/CakeText.php";s:10:"Dispatcher";s:78:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Routing/Dispatcher.php";s:17:"CakeEventListener";s:83:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Event/CakeEventListener.php";s:11:"CakeRequest";s:79:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Network/CakeRequest.php";s:12:"CakeResponse";s:80:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Network/CakeResponse.php";s:9:"CakeEvent";s:75:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Event/CakeEvent.php";s:16:"CakeEventManager";s:82:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Event/CakeEventManager.php";s:15:"AssetDispatcher";s:90:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Routing/Filter/AssetDispatcher.php";s:16:"DispatcherFilter";s:84:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Routing/DispatcherFilter.php";s:15:"CacheDispatcher";s:90:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Routing/Filter/CacheDispatcher.php";s:6:"Router";s:74:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Routing/Router.php";s:9:"CakeRoute";s:83:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Routing/Route/CakeRoute.php";s:10:"CakePlugin";s:75:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Core/CakePlugin.php";s:15:"PagesController";s:58:"/home/kod3/work/vitrine/app/Controller/PagesController.php";s:13:"AppController";s:56:"/home/kod3/work/vitrine/app/Controller/AppController.php";s:10:"Controller";s:81:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Controller/Controller.php";s:6:"Object";s:71:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Core/Object.php";s:19:"ComponentCollection";s:90:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Controller/ComponentCollection.php";s:16:"SessionComponent";s:97:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Controller/Component/SessionComponent.php";s:9:"Component";s:80:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Controller/Component.php";s:14:"FlashComponent";s:95:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Controller/Component/FlashComponent.php";s:4:"View";s:69:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/View/View.php";s:16:"HelperCollection";s:81:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/View/HelperCollection.php";s:9:"ViewBlock";s:74:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/View/ViewBlock.php";s:13:"HtmlExtHelper";s:57:"/home/kod3/work/vitrine/app/View/Helper/HtmlExtHelper.php";s:10:"HtmlHelper";s:83:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/View/Helper//HtmlHelper.php";s:9:"AppHelper";s:53:"/home/kod3/work/vitrine/app/View/Helper/AppHelper.php";s:6:"Helper";s:71:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/View/Helper.php";s:13:"ClassRegistry";s:81:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Utility/ClassRegistry.php";s:13:"SessionHelper";s:85:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/View/Helper/SessionHelper.php";s:11:"CakeSession";s:88:"/home/kod3/work/vitrine/vendor/cakephp/cakephp/lib/Cake/Model/Datasource/CakeSession.php";}