Merge branch 'v12.05' of github.com:pizzapanther/Neutron-IDE into v12.05

pizzapanther · May 10, 2012 · e51ecae · e51ecae
2 parents 256ecc1 + cf5390f
commit e51ecae
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/neutron/ide/static/ide/js/terminal.js b/neutron/ide/static/ide/js/terminal.js
@@ -678,19 +678,19 @@ function calc_term_size () {
   LINES = Math.floor(page_h / char_h);
 }
 
-var pref_win;
+var pref_win_term;
 $(document).ready(function () {
-  pref_win = $("#term_pref").kendoWindow({title: 'Terminal Preferences', modal: true, width: "600px", visible: false}).data("kendoWindow");
+  pref_win_term = $("#term_pref").kendoWindow({title: 'Terminal Preferences', modal: true, width: "630px", visible: false}).data("kendoWindow");
 });
 
-function show_pref () {
-  pref_win.center();
-  pref_win.open();
+function show_pref_term () {
+  pref_win_term.center();
+  pref_win_term.open();
   $("#term_pref iframe").attr('src', '/term_pref/');
 }
 
-function update_prefs (new_prefs) {
-  pref_win.close();
+function update_prefs_term (new_prefs) {
+  pref_win_term.close();
 
   if (tsplit) {
     $('#termbody').css('background-image', 'url(' + new_prefs.bg + ')');

diff --git a/neutron/ide/templates/ide/term_pref_success.html b/neutron/ide/templates/ide/term_pref_success.html
@@ -4,6 +4,6 @@ <h1 class="message">Hold On To Your Butts!</h1>
 {% endblock %}
 {% block footer %}
 <script type="text/javascript">
-  parent.update_prefs({{ new_prefs|safe }});
+  parent.update_prefs_term({{ new_prefs|safe }});
 </script>
 {% endblock %}
diff --git a/neutron/ide/templates/ide/terminal.html b/neutron/ide/templates/ide/terminal.html
@@ -42,7 +42,7 @@
         <div class="a" onclick="close_current()" id="close_icon">
           <img src="{{ STATIC_URL }}ide/img/term/close.png" alt="Close Terminal" title="Close Terminal">
         </div>
-        <div class="a" onclick="show_pref()" id="pref_icon">
+        <div class="a" onclick="show_pref_term()" id="pref_icon">
           <img src="{{ STATIC_URL }}ide/img/term/gears.png" alt="Preferences" title="Preferences">
         </div>
         <div class="a" onclick="select_mode()" id="sel_icon">
@@ -73,7 +73,7 @@
         <input type="button" name="connect" value="Reconnect" onclick="reconnect()">
       </div>
       <div id="term_pref">
-        <iframe width="100%" height="260" frameBorder="0" scrolling="auto"></iframe>
+        <iframe width="100%" height="300" frameBorder="0" scrolling="auto"></iframe>
       </div>
       <script type="text/javascript">
         var ws;

diff --git a/neutron/static/ide/js/terminal.js b/neutron/static/ide/js/terminal.js
@@ -678,19 +678,19 @@ function calc_term_size () {
   LINES = Math.floor(page_h / char_h);
 }
 
-var pref_win;
+var pref_win_term;
 $(document).ready(function () {
-  pref_win = $("#term_pref").kendoWindow({title: 'Terminal Preferences', modal: true, width: "600px", visible: false}).data("kendoWindow");
+  pref_win_term = $("#term_pref").kendoWindow({title: 'Terminal Preferences', modal: true, width: "630px", visible: false}).data("kendoWindow");
 });
 
-function show_pref () {
-  pref_win.center();
-  pref_win.open();
+function show_pref_term () {
+  pref_win_term.center();
+  pref_win_term.open();
   $("#term_pref iframe").attr('src', '/term_pref/');
 }
 
-function update_prefs (new_prefs) {
-  pref_win.close();
+function update_prefs_term (new_prefs) {
+  pref_win_term.close();
 
   if (tsplit) {
     $('#termbody').css('background-image', 'url(' + new_prefs.bg + ')');