]> git.andy128k.dev Git - ipf.git/commitdiff
projects / ipf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 491a1fd 502609f)
merge
authorroot <root@krishna.icmconsulting.com>
Wed, 18 May 2011 17:55:07 +0000 (13:55 -0400)
committerroot <root@krishna.icmconsulting.com>
Wed, 18 May 2011 17:55:07 +0000 (13:55 -0400)
1  2 
ipf/admin/templates/admin/base.html patch | diff1 | diff2 | blob | history

diff --cc ipf/admin/templates/admin/base.html
index a48e7366aa562f912d83350016c05e67d0fbe247,d20e4c1841d90b5b1862555540a6c25bedc8c066..59122bf6a9dae64f83144dba3879bb178ebdf40f
--- 1/ipf/admin/templates/admin/base.html
--- 2/ipf/admin/templates/admin/base.html
+++ b/ipf/admin/templates/admin/base.html
@@@ -10,13 -11,9 +11,16 @@@
  </head>
  
  <body class="{block bodyclass}{/block}">
 +{block commonjs}
 +{if isset($form) && method_exists($form, 'render_commonjs')}
 +{$form.render_commonjs()|safe}
 +{else}
  <script language="javascript" type="text/javascript" src="{$ADMIN_MEDIA_URL}js/jquery.js"></script>
+ <script language="javascript" type="text/javascript" src="{$ADMIN_MEDIA_URL}js/jquery-ui.custom.js"></script>
+ <script language="javascript" type="text/javascript" src="{$ADMIN_MEDIA_URL}js/admin.js"></script>
 +{/if}
 +{/block}
++
  <div id="container">
      <div id="header">
          <div id="branding">