Sync some of our fixes. favicon.ico is just to stop the 404s from new bro...

latham

2011-05-19 50c6d10218138f8fdcb669677fe41e0ecf42e454

 interface/web/tools/templates/user_settings.htm

@@ -25,11 +25,11 @@
            </select>
      </div>
     <div class="ctrlHolder">
         <label for="id_rsa">id_rsa</label>
         <label for="id_rsa">{tmpl_var name='id_rsa_txt'}</label>
        <textarea name="id_rsa" id="id_rsa" readonly rows='10' cols='30'>{tmpl_var name='id_rsa'}</textarea>
      </div>
      <div class="ctrlHolder">
         <label for="ssh_rsa">ssh_rsa</label>
         <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
        <input name="ssh_rsa" id="ssh_rsa" value="{tmpl_var name='ssh_rsa'}" size="30" maxlength="600" type="text" class="textInput" />
      </div>