update jquery version and config front page. Qiu

winsonwq · winsonwq · commit c2ae92ecd648 · 2012-11-06T15:25:16.000+11:00
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ sites/*/files
 sites/*/private
 sites/all/modules/*
 !custom
-
+!contrib
diff --git a/misc/jquery.js b/misc/jquery.js
diff --git a/sites/all/modules/custom/admin_feature/admin_feature.features.inc b/sites/all/modules/custom/admin_feature/admin_feature.features.inc
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @file
+ * admin_feature.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function admin_feature_ctools_plugin_api() {
+  list($module, $api) = func_get_args();
+  if ($module == "strongarm" && $api == "strongarm") {
+    return array("version" => "1");
+  }
+}
diff --git a/sites/all/modules/custom/admin_feature/admin_feature.info b/sites/all/modules/custom/admin_feature/admin_feature.info
@@ -9,7 +9,9 @@ dependencies[] = fe_block
 dependencies[] = menu
 dependencies[] = search
 dependencies[] = shortcut
+dependencies[] = strongarm
 dependencies[] = views
+features[ctools][] = strongarm:strongarm:1
 features[fe_block_settings][] = comment-recent
 features[fe_block_settings][] = devel-execute_php
 features[fe_block_settings][] = devel-switch_user
@@ -32,3 +34,7 @@ features[fe_block_settings][] = user-online
 features[fe_block_settings][] = views-2b7ac13d6e7259d35a842083a8dbb9b1
 features[fe_block_settings][] = views-latest_questions-block
 features[features_api][] = api:1
+features[variable][] = site_frontpage
+features[variable][] = site_mail
+features[variable][] = site_name
+features[variable][] = site_slogan
diff --git a/sites/all/modules/custom/admin_feature/admin_feature.strongarm.inc b/sites/all/modules/custom/admin_feature/admin_feature.strongarm.inc
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @file
+ * admin_feature.strongarm.inc
+ */
+
+/**
+ * Implements hook_strongarm().
+ */
+function admin_feature_strongarm() {
+  $export = array();
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'site_frontpage';
+  $strongarm->value = 'homepage';
+  $export['site_frontpage'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'site_mail';
+  $strongarm->value = 'admin@example.com';
+  $export['site_mail'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'site_name';
+  $strongarm->value = 'Quiz Wall';
+  $export['site_name'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'site_slogan';
+  $strongarm->value = '';
+  $export['site_slogan'] = $strongarm;
+
+  return $export;
+}
diff --git a/sites/all/themes/light/light.info b/sites/all/themes/light/light.info
@@ -13,8 +13,9 @@ stylesheets[all][] = library/bootstrap/css/bootstrap.min.css
 stylesheets[all][] = css/style_custom.css
 stylesheets[print][] = css/print.css
 
-
+scripts[] = library/masonry/jquery.masonry.min.js
 scripts[] = library/bootstrap/js/bootstrap.min.js
+scripts[] = javascript/main.js
 
 regions[header] = Header
 regions[help] = Help
diff --git a/sites/all/themes/light/templates/html.tpl.php b/sites/all/themes/light/templates/html.tpl.php
@@ -48,16 +48,7 @@
   <?php print $head; ?>
   <title><?php print $head_title; ?></title>
   <?php print $styles; ?>
-  <?php 
-    $js_arr = array('/library/jquery/jquery.min.js',
-      '/library/masonry/jquery.masonry.min.js',
-      '/library/bootstrap/js/bootstrap.min.js',
-      '/javascript/main.js');
-  ?>
-  <!--?php print $scripts; ?-->
-  <?php foreach($js_arr as $link) { ?>
-    <script type="text/javascript" src="<?php print drupal_get_path('theme', 'light').$link; ?>"></script>
-  <?php } ?>
+  <?php print $scripts; ?>
   
 </head>
 <body class="<?php print $classes; ?>" <?php print $attributes;?>>
