← Back to branch summary

~leeturner/quam-plures/twitter-bootstap-integration

« back to all changes in this revision

Viewing changes to qp_view_admin/_html_header.inc.php

  • Committer: Lee Turner
  • Date: 2012-08-16 17:06:32 UTC
  • Revision ID: lee@leeturner.org-20120816170632-sj1jelnnc2jswhpk
For now I have duplicated some of the css files so I can isolate the admin css and slowly remove it as I move things over to bootstrap

Show diffs side-by-side

added added

removed removed

Lines of Context:
qp_view_admin/_html_header.inc.php
58
58
                var srvc_url = \''.$srvc_url.'\';
59
59
                var current_blog = '.$blog.';' );
60
60
 
61
 
        // add_js_for_toolbar(); // registers javascripts for the navbar
 
61
        add_js_for_toolbar(); // registers javascripts for the navbar
62
62
 
63
63
        require_js( '#jqueryUI#' );
64
64
 
294
294
                        })
295
295
                })' );
296
296
 
 
297
 
 
298
        require_css( 'qp_rsc/css/bootstrap.min.css', true );
 
299
        require_css( 'qp_rsc/css/bootstrap-responsive.css', true );
 
300
        require_js( 'qp_rsc/js/bootstrap.min.js', true );
 
301
        require_js( 'qp_rsc/js/bootstrap-transition.js', true );
 
302
        require_js( 'qp_rsc/js/bootstrap-alert.js', true );
 
303
        require_js( 'qp_rsc/js/bootstrap-modal.js', true );
 
304
        require_js( 'qp_rsc/js/bootstrap-dropdown.js', true );
 
305
        require_js( 'qp_rsc/js/bootstrap-scrollspy.js', true );
 
306
        require_js( 'qp_rsc/js/bootstrap-tab.js', true );
 
307
        require_js( 'qp_rsc/js/bootstrap-tooltip.js', true );
 
308
        require_js( 'qp_rsc/js/bootstrap-popover.js', true );
 
309
        require_js( 'qp_rsc/js/bootstrap-button.js', true );
 
310
        require_js( 'qp_rsc/js/bootstrap-collapse.js', true );
 
311
        require_js( 'qp_rsc/js/bootstrap-typeahead.js', true );
 
312
 
297
313
        // CALL PLUGINS NOW:
298
314
        global $Plugins;
299
315
        $Plugins->trigger_event( 'AdminEndHtmlHead', array() );
300
316
 
301
317
        include_headlines(); // output collected <head> lines
302
318
?>
303
 
        <!-- <link rel="stylesheet" type="text/css" href="qp_rsc/css/bootstrap.min.css" /> -->
304
 
        <!-- <link rel="stylesheet" type="text/css" href="qp_rsc/css/bootstrap-responsive.css" /> -->
305
319
        <!--[if lt IE 9]>
306
320
      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
307
321
    <![endif]-->
308
322
        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
309
 
        <!-- <script type="text/javascript" src="qp_rsc/js/jquery.min.js"></script> 
310
 
        <script type="text/javascript" src="qp_rsc/js/bootstrap.min.js"></script>
311
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-transition.js"></script>
312
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-alert.js"></script>
313
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-modal.js"></script>
314
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-dropdown.js"></script>
315
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-scrollspy.js"></script>
316
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-tab.js"></script>
317
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-tooltip.js"></script>
318
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-popover.js"></script>
319
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-button.js"></script>
320
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-collapse.js"></script>
321
 
<script type="text/javascript" src="qp_rsc/js/bootstrap-typeahead.js"></script> -->
322
323
 
323
324
<script type="text/javascript">
324
325
    jQuery(function($) {