Minor fixes

eFiction · Mar 1, 2018 · 71b4bbb · 71b4bbb
1 parent a4132e9
commit 71b4bbb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/inc/sql/install/job_menu.php b/inc/sql/install/job_menu.php
@@ -46,46 +46,46 @@ function menu_admin($job, $step)
 
 $sql = <<<EOF
 INSERT INTO `{$fw->dbNew}menu_adminpanel` (`label`, `child_of`, `order`, `link`, `icon`, `active`, `requires`, `evaluate`) VALUES
-('Home',			NULL,				1, 'home', '{ICON:home}', 1, 32, NULL),
+('Home',		NULL,				1, 'home', '{ICON:home}', 1, 32, NULL),
 ('Settings',		NULL,				2, 'settings', '{ICON:settings}', 1, 128, NULL),
-('Members',			NULL,				3, 'members', '{ICON:member}', 1, 128, NULL),
-('Archive',			NULL,				4, 'archive', '{ICON:archive}', 1, 64, NULL),
-('Stories',			NULL,				5, 'stories', '{ICON:book}', 1, 64, NULL),
+('Members',		NULL,				3, 'members', '{ICON:member}', 1, 128, NULL),
+('Archive',		NULL,				4, 'archive', '{ICON:archive}', 1, 64, NULL),
+('Stories',		NULL,				5, 'stories', '{ICON:book}', 1, 64, NULL),
 ('Submission',		'archive',			1, 'archive/submit', '{ICON:blank}', 1, 64, NULL),
 ('Featured',		'archive',			2, 'archive/featured', '{ICON:blank}', 1, 64, NULL),
-('Contests',		'archive',			3, 'archive/contests', '{ICON:blank}', 1, 64, '['optional_modules']['contests']'),
+('Contests',		'archive',			3, 'archive/contests', '{ICON:blank}', 1, 64, '[\'optional_modules\'][\'contests\']'),
 ('Characters',		'archive',			4, 'archive/characters', '{ICON:members}', 1, 64, NULL),
-('Tags',			'archive',			5, 'archive/tags', '{ICON:tag}', 1, 64, NULL),
+('Tags',		'archive',			5, 'archive/tags', '{ICON:tag}', 1, 64, NULL),
 ('Categories',		'archive', 			6, 'archive/categories', '{ICON:blank}', 1, 64, NULL),
 ('Settings',		'archive/featured',	1, 'archive/featured', '{ICON:blank}', 1, 64, NULL),
-('Current',			'archive/featured', 2, 'archive/featured/select=current', '{ICON:blank}', 1, 64, NULL),
-('Future',			'archive/featured', 3, 'archive/featured/select=future', '{ICON:blank}', 1, 64, NULL),
-('Past',			'archive/featured', 4, 'archive/featured/select=past', '{ICON:blank}', 1, 64, NULL),
-('Edit',			'archive/tags',		1, 'archive/tags/edit', '{ICON:tag}', 1, 64, NULL),
+('Current',		'archive/featured', 2, 'archive/featured/select=current', '{ICON:blank}', 1, 64, NULL),
+('Future',		'archive/featured', 3, 'archive/featured/select=future', '{ICON:blank}', 1, 64, NULL),
+('Past',		'archive/featured', 4, 'archive/featured/select=past', '{ICON:blank}', 1, 64, NULL),
+('Edit',		'archive/tags',		1, 'archive/tags/edit', '{ICON:tag}', 1, 64, NULL),
 ('Taggroups',		'archive/tags',		2, 'archive/tags/groups', '{ICON:tags}', 1, 128, NULL),
 ('Tagcloud',		'archive/tags',		3, 'archive/tags/cloud', '{ICON:cloud}', 1, 128, NULL),
-('Manual',			'home',				1, 'home/manual', '{ICON:manual}', 1, 32, NULL),
+('Manual',		'home',				1, 'home/manual', '{ICON:manual}', 1, 32, NULL),
 ('CustomPages',		'home',				2, 'home/custompages', '{ICON:text}', 1, 64, NULL),
-('News',			'home',				3, 'home/news', '{ICON:news}', 1, 32, NULL),
-('Modules',			'home',				4, 'home/modules', '{ICON:modules}', 1, 128, NULL),
-('Logs',			'home',				5, 'home/logs', '{ICON:blank}', 1, 64, ''),
-('Shoutbox',		'home',				6, 'home/shoutbox', '{ICON:blank}', 1, 64, '['optional_modules']['shoutbox']'),
-('Edit',			'members',			1, 'members/edit', '{ICON:search}', 1, 128, NULL),
-('Pending',			'members',			2, 'members/pending', '{ICON:waiting}', 1, 128, NULL),
-('Groups',			'members',			3, 'members/groups', '{ICON:members}', 1, 128, NULL),
-('Profile',			'members',			4, 'members/profile', '{ICON:blank}', 1, 128, NULL),
-('Team',			'members',			5, 'members/team', '{ICON:blank}', 1, 128, NULL),
-('Server',			'settings',			1, 'settings/server', '{ICON:wrench}', 1, 128, NULL),
+('News',		'home',				3, 'home/news', '{ICON:news}', 1, 32, NULL),
+('Modules',		'home',				4, 'home/modules', '{ICON:modules}', 1, 128, NULL),
+('Logs',		'home',				5, 'home/logs', '{ICON:blank}', 1, 64, ''),
+('Shoutbox',		'home',				6, 'home/shoutbox', '{ICON:blank}', 1, 64, '[\'optional_modules\'][\'shoutbox\']'),
+('Edit',		'members',			1, 'members/edit', '{ICON:search}', 1, 128, NULL),
+('Pending',		'members',			2, 'members/pending', '{ICON:waiting}', 1, 128, NULL),
+('Groups',		'members',			3, 'members/groups', '{ICON:members}', 1, 128, NULL),
+('Profile',		'members',			4, 'members/profile', '{ICON:blank}', 1, 128, NULL),
+('Team',		'members',			5, 'members/team', '{ICON:blank}', 1, 128, NULL),
+('Server',		'settings',			1, 'settings/server', '{ICON:wrench}', 1, 128, NULL),
 ('Security',		'settings',			2, 'settings/security', '{ICON:lock}', 1, 128, NULL),
 ('Screening',		'settings',			3, 'settings/screening', '{ICON:visible}', 1, 128, NULL),
 ('Registration',	'settings',			4, 'settings/registration', '{ICON:register}', 1, 128, NULL),
-('Layout',			'settings',			5, 'settings/layout', '{ICON:layout}', 1, 64, NULL),
+('Layout',		'settings',			5, 'settings/layout', '{ICON:layout}', 1, 64, NULL),
 ('Language',		'settings',			6, 'settings/language', '{ICON:language}', 1, 128, NULL),
-('Themes',			'settings/layout',	1, 'settings/layout/themes', '{ICON:blank}', 1, 128, NULL),
-('Icons',			'settings/layout',	2, 'settings/layout/icons', '{ICON:blank}', 1, 128, NULL),
-('Pending',			'stories',			1, 'stories/pending', '{ICON:waiting}', 1, 32, NULL),
-('Edit',			'stories',			2, 'stories/edit', '{ICON:edit}', 1, 32, NULL),
-('Add',				'stories',			3, 'stories/add', '{ICON:document-new}', 1, 64, NULL);
+('Themes',		'settings/layout',	1, 'settings/layout/themes', '{ICON:blank}', 1, 128, NULL),
+('Icons',		'settings/layout',	2, 'settings/layout/icons', '{ICON:blank}', 1, 128, NULL),
+('Pending',		'stories',			1, 'stories/pending', '{ICON:waiting}', 1, 32, NULL),
+('Edit',		'stories',			2, 'stories/edit', '{ICON:edit}', 1, 32, NULL),
+('Add',			'stories',			3, 'stories/add', '{ICON:document-new}', 1, 64, NULL);
 EOF;
 
 	$fw->db5->exec($sql);
@@ -149,4 +149,4 @@ function menu_user($job, $step)
 						]
 					);
 }
-?>
+?>
diff --git a/ui/install/storage.htm b/ui/install/storage.htm
@@ -5,10 +5,10 @@ <h2>Select chapter storage location</h2>
 <div>
 <check if="{{ @installerCFG.test.db5 > 0 }}">
 <true>
-	<include href="storage.htm" />
+	<include href="upgrade/storage.htm" />
 </true>
 <false>
 	<div class='alert-box error'>Could not connect to database server, please <a href="fresh/config">see the configuration page</a></div>
 </false>
 </check>
-</div>
+</div>