Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of git@github.com:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #11 from emanuele45/master

See if you like them.
Spuds 13 years ago
parent
ea0f0e3b90 e234dc203c
commit
b8355c6b04
8 changed files with 9 additions and 7 deletions
Split View Show Diff Stats
  1. 1 0
      Sources/Admin.php
  2. 7 2
      Sources/Load.php
  3. 1 0
      Sources/ModerationCenter.php
  4. 0 4
      Themes/default/Admin.template.php
  5. 0 1
      Themes/default/ModerationCenter.template.php
  6. BIN
      Themes/default/images/admin/members.png
  7. BIN
      Themes/default/images/admin/packages.png
  8. BIN
      Themes/default/images/admin/permissions.png

+ 1 - 0
Sources/Admin.php
View File 

@@ -30,6 +30,7 @@ function AdminMain()
 
 	// Load the language and templates....
 
 	loadLanguage('Admin');
 
 	loadTemplate('Admin', 'admin');
 
+	loadJavascriptFile('scripts/admin.js?fin20', array('default_theme' => true));
 
 
 	// No indexing evil stuff.
 
 	$context['robot_no_index'] = true;

+ 7 - 2
Sources/Load.php
View File 

@@ -1988,14 +1988,19 @@ function loadCSSFile($filename, $options = array())
 
  * Add a Javascript file for output later
 
  *
 
  * @param string $filename
 
- * @param array $options
 
+ * @param array $options, possible parameters:
 
+ * 	- local (true/false): define if the file is local
 
+ * 	- default_theme (true/false): force use of default theme url
 
+ * 	- defer (true/false): define if the file should be load in head or before the closing <html> tag
 
  */
 
 function loadJavascriptFile($filename, $options = array())
 
 {
 
 	global $settings, $context;
 
 
+	$theme = !empty($options['default_theme']) ? 'default_theme_url' : 'theme_url';
 
+
 
 	if (strpos($filename, 'http') === false || !empty($options['local']))
 
-		$filename = $settings['theme_url'] . '/' . $filename;
 
+		$filename = $settings[$theme] . '/' . $filename;
 
 
 	$context['javascript_files'][$filename] = $options;
 
 }

+ 1 - 0
Sources/ModerationCenter.php
View File 

@@ -225,6 +225,7 @@ function ModerationHome()
 
 	global $txt, $context, $scripturl, $modSettings, $user_info, $user_settings;
 
 
 	loadTemplate('ModerationCenter');
 
+	loadJavascriptFile('scripts/admin.js?fin20', array('default_theme' => true));
 
 
 	$context['page_title'] = $txt['moderation_center'];
 
 	$context['sub_template'] = 'moderation_center';

+ 0 - 4
Themes/default/Admin.template.php
View File 

@@ -141,7 +141,6 @@ function template_admin()
 
 
 	// This sets the announcements and current versions themselves ;).
 
 	echo '
 
-		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/admin.js?fin20"></script>
 
 		<script type="text/javascript"><!-- // --><![CDATA[
 
 			var oAdminIndex = new smf_AdminIndex({
 
 				sSelf: \'oAdminCenter\',
 
@@ -587,7 +586,6 @@ function template_view_versions()
 
 	   file categories. (sources, languages, and templates.) */
 
 	echo '
 
 		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=detailed-version.js"></script>
 
-		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/admin.js?fin20"></script>
 
 		<script type="text/javascript"><!-- // --><![CDATA[
 
 			var oViewVersions = new smf_ViewVersions({
 
 				aKnownLanguages: [
 
@@ -1443,8 +1441,6 @@ function template_callback_question_answer_list()
 
 		<dt id="add_more_question_placeholder" style="display: none;"></dt><dd></dd>
 
 		<dt id="add_more_link_div" style="display: none;">
 
 			<a href="#" onclick="addAnotherQuestion(); return false;">&#171; ', $txt['setup_verification_add_more'], ' &#187;</a>
 
-			<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/admin.js?fin20"></script>
 
-
 
 		</dt><dd></dd>';
 
 
 	// The javascript needs to go at the end but we'll put it in this template for looks.

+ 0 - 1
Themes/default/ModerationCenter.template.php
View File 

@@ -72,7 +72,6 @@ function template_latest_news()
 
 	echo '
 
 		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 
 		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>
 
-		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/admin.js?fin20"></script>
 
 		<script type="text/javascript"><!-- // --><![CDATA[
 
 			var oAdminIndex = new smf_AdminIndex({
 
 				sSelf: \'oAdminCenter\',

BIN
Themes/default/images/admin/members.png
View File


BIN
Themes/default/images/admin/packages.png
View File


BIN
Themes/default/images/admin/permissions.png
View File