Merge pull request #32 from magento-webdev/develop

[UI] Pre-Milestone 8 work

Author: Natalia Momotenko

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -14,7 +14,7 @@
         <?php endforeach;?>
     </ul>
 </div>
-<script type="text/javascript">
+<script>
 require([
     "jquery",
     "jquery/ui"

app/code/Magento/Backend/Block/Widget/Form/Container.php

@@ -178,7 +178,7 @@ public function getFormHtml()
     public function getFormInitScripts()
     {
         if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
-            return '<script type="text/javascript">' . implode("\n", $this->_formInitScripts) . '</script>';
+            return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
         }
         return '';
     }
@@ -189,7 +189,7 @@ public function getFormInitScripts()
     public function getFormScripts()
     {
         if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
-            return '<script type="text/javascript">' . implode("\n", $this->_formScripts) . '</script>';
+            return '<script>' . implode("\n", $this->_formScripts) . '</script>';
         }
         return '';
     }

app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

@@ -120,7 +120,7 @@ protected function _toHtml()
         if (!$this->_depends) {
             return '';
         }
-        return '<script type="text/javascript">
+        return '<script>
             require(["mage/adminhtml/form"], function(){
         new FormElementDependenceController(' .
             $this->_getDependsJson() .

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -86,7 +86,7 @@ public function getHtml()
             ' value="' .
             $this->_localeResolver->getLocaleCode() .
             '"/>';
-        $html .= '<script type="text/javascript">
+        $html .= '<script>
             require(["jquery", "mage/calendar"], function($){
                 $("#' .
             $htmlId .

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -130,7 +130,7 @@ public function getHtml()
             ) . '/>' . '</div></div>';
         $html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
             . $this->_localeResolver->getLocaleCode() . '"/>';
-        $html .= '<script type="text/javascript">
+        $html .= '<script>
             require(["jquery", "mage/calendar"],function($){
                     $("#' . $htmlId . '_range").dateRange({
                         dateFormat: "' . $format . '",

app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php

@@ -32,7 +32,7 @@ public function __construct(
      */
     protected function _getDeniedIframe()
     {
-        return '<script type="text/javascript">parent.window.location = \''
+        return '<script>parent.window.location = \''
             . $this->_helper->getHomePageUrl() . '\';</script>';
     }
 

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -76,7 +76,7 @@
                 <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
                 <block class="Magento\Backend\Block\Page\Footer" name="version" as="version">
                     <arguments>
-                        <argument name="bugreport_url" xsi:type="string">http://www.magentocommerce.com/bug-tracking</argument>
+                        <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
                     </arguments>
                 </block>
             </container>

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

@@ -38,7 +38,7 @@
                         </div>
                     </fieldset>
                 </form>
-                <script type="text/javascript">
+                <script>
                     function initForm($){
                         $('#login-form').form().validation();
                     }

app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml

@@ -45,7 +45,7 @@ $numColumns = sizeof($this->getColumns());
     </table>
 </div>
 <?php if ($this->canDisplayContainer()): ?>
-<script type="text/javascript">
+<script>
 var deps = ['mage/adminhtml/grid'];
 
 <?php if (strpos($this->getRowClickCallback(), 'order.') !== false): ?>

app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml

@@ -6,7 +6,7 @@
 ?>
 
 <?php if (is_array($this->getChildBlock('diagrams')->getTabsIds())) : ?>
-<script type="text/javascript">
+<script>
 function changeDiagramsPeriod(periodObj) {
     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
 <?php foreach ($this->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>