SKIN: use sprite

Oyana · Apr 5, 2016 · 0e3cd3a · 0e3cd3a
1 parent fc5b8c8
commit 0e3cd3a
Show file tree

Hide file tree

Showing 28 changed files with 1,499 additions and 3,141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 /cache/.sass-cache/*
 /cache/.smarty-cache/*
 /cache/.smarty-compile/*
+/templates/*/node_modules/
 
 # Compiled source #
 ###################

diff --git a/Class/FrontController.php b/Class/FrontController.php
@@ -141,10 +141,11 @@ public function getList()
 
 				$xmlfile = $value."/.git/sourcetreeconfig";
 				$confFile = $value."/.git/config";
+				$confSvn = $value."/.svn/";
 
 				$siteList[$key]["img"] = $this->getBck( $siteList[$key]["name"] );
 				$siteList[$key]["commitKey"] = $this->getComitKey( $siteList[$key]["name"] );
-				if (file_exists($xmlfile))
+				if ( file_exists($xmlfile) )
 				{
 					$xmlparser = xml_parser_create();
 					$fp = fopen($xmlfile, 'r');
@@ -166,7 +167,7 @@ public function getList()
 				}
 
 				// could cause error login if clone by url
-				if(file_exists($confFile) && empty($identifier) )
+				if( file_exists($confFile) && empty($identifier) )
 				{
 					$fp = fopen($confFile, 'r');
 					$data = fread($fp, 4096);
@@ -205,8 +206,12 @@ public function getList()
 						{
 							$siteList[$key]["linkType"] = "git";
 						}
-					}
-
+					}	
+				}
+				elseif ( file_exists($confSvn) )
+				{
+					$siteList[$key]["linkType"] = "svn";
+					$siteList[$key]["link"] = "#svn";
 				}
 			}
 		}

diff --git a/config/defines.php b/config/defines.php
@@ -1,9 +1,8 @@
 <?php 
-// DEV
-define("MYLOCAL_RELEASE", "0.2");
+define("MYLOCAL_RELEASE", "0.2.2");
 define("DEV_MOD", true);
 define("COMPRESSED_FILES_MOD", true);
-define("CACHES_FILES_MOD", true);
+define("CACHES_FILES_MOD", false);
 define("CHECK_COMPILATION", true);
 define("MAIN_FOLDER_NAME", "myLocal");
 define("TEMPLATE_NAME", "night2015");

diff --git a/templates/night2015/config.rb b/templates/night2015/config.rb
@@ -5,6 +5,6 @@
 javascripts_dir = "js"
 cache_path = "../../../cache/.sass-cache"
 relative_assets = true
-# output_style = :compressed
-output_style = :nested
+output_style = :compressed
+# output_style = :nested
 line_comments = false