2014/10/01 Fix bug and improve theme

Fix bug that report error when MAIN_SITE_URL contains numbers. Change theme icon into Web Font.
qakcn · Oct 1, 2014 · 2676009 · 2676009
1 parent 8848876
commit 2676009
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 335 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ thumbs/*
 *~
 apikey/*
 config.timestamp
+themes/default/fonts/iconfont.css
diff --git a/engine.php b/engine.php
@@ -64,7 +64,7 @@ function check_config() {
 		}
 		if(!(
 			defined('MAIN_SITE_URL') &&
-			preg_match('/^https?:\/\/[a-zA-Z_\-.]+(\/.*)?$/', MAIN_SITE_URL)
+			preg_match('/^https?:\/\/[a-zA-Z0-9_\-.]+(\/.*)?$/', MAIN_SITE_URL)
 		)) {
 			exit('MAIN_SITE_URL set incorrectly.');
 		}

diff --git a/themes/default/fonts/iconfont.eot b/themes/default/fonts/iconfont.eot
diff --git a/themes/default/fonts/iconfont.svg b/themes/default/fonts/iconfont.svg
diff --git a/themes/default/fonts/iconfont.ttf b/themes/default/fonts/iconfont.ttf
diff --git a/themes/default/fonts/iconfont.woff b/themes/default/fonts/iconfont.woff
diff --git a/themes/default/header.php b/themes/default/header.php
@@ -57,11 +57,11 @@
 	<div id="logo"></div>
 	<?php if(!is_page()) { ?>
 	<div id="upload_button_wrap">
-		<button class="affirmative" id="upload_button" title="<?=__('Upload files') ?>"><span id="add_mark">&#10133;</span><span id="close_mark">&#10060;</span><span class="hide_mobile">&nbsp;<?=__('Upload') ?></span></button>
+		<button class="affirmative" id="upload_button" title="<?=__('Upload files') ?>"><span class="hide_mobile">&nbsp;<?=__('Upload') ?></span></button>
 	</div>
 	<?php } ?>
 	<div id="lang_sel">
-		<img src="<?=get_url().theme_path() ?>images/WorldMap.svg"><span class="hide_mobile"><?=__('Language') ?></span>
+		<span class="hide_mobile"><?=__('Language') ?></span>
 		<ul><?=get_langlist() ?></ul>
 	</div>
 </header>