merge from branch 1.5.3.2 (~r11282)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/editor/components/image_gallery/tpl/list_gallery.html

@@ -5,7 +5,7 @@
 	<load target="gallery.min.js" />
 	<load target="list_gallery.min.js" />
 <!--@end-->
-<script>
+<script type="text/javascript">
 (function(){
 
 var gallery = xe.getApp('gallery')[0];

modules/editor/components/image_gallery/tpl/popup.html

@@ -39,7 +39,7 @@
             <th scope="row">{$lang->gallery_border_color}</th>
             <td>
                 <div class="editor_color_box">
-                    <script>
+                    <script type="text/javascript">
                     printColor("border", "{$tpl_path}/images/blank.gif");
                     </script>
                 </div>
@@ -53,7 +53,7 @@
             <th scope="row">{$lang->gallery_bg_color}</th>
             <td>
                 <div class="editor_color_box">
-                    <script>
+                    <script type="text/javascript">
                         printColor("bg", "{$tpl_path}/images/blank.gif");
                     </script>
                 </div>

modules/editor/components/image_gallery/tpl/slide_gallery.html

@@ -8,7 +8,7 @@
 	<load target="slide_gallery.min.js" />
 	<load target="slide_gallery.min.css" />
 <!--@end-->
-<script>
+<script type="text/javascript">
 (function(){
 
 var gallery = xe.getApp('gallery')[0];

modules/editor/components/poll_maker/tpl/popup.html

@@ -6,7 +6,7 @@
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui.datepicker")-->
 
-<script>
+<script type="text/javascript">
     var msg_poll_cannot_modify = "{$lang->msg_poll_cannot_modify}";
 </script>
 
@@ -25,7 +25,7 @@
 
             <input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*30)}" />
             <input type="text" class="inputDate" value="{date('Y-m-d',time()+60*60*24*30)}" readonly="readonly" />
-<script>
+<script type="text/javascript">
 (function($){
     $(function(){
         var option = {