Revision 46990631

b/settings.d/30-ui.conf
4 4 
###################
5 5 

  		





  6
  6
  
    
# base url for ui static files


  		





  7
  
  
    
UI_MEDIA_URL = MEDIA_URL


  		





  
  7
  
    
#UI_MEDIA_URL = MEDIA_URL + 'snf/'


  		





  8
  8
  
    

  		





  9
  9
  
    
# UI requests to the API layer time out after that many milliseconds


  		





  10
  10
  
    
TIMEOUT = 10 * 1000


  		












  

    
      b/ui/templates/home.html
    
  






  173
  173
  
    
</head>


  		





  174
  174
  
    

  		





  175
  175
  
    
<body id="app">


  		





  176
  
  
    
    <!--<img id="okeanos-image" src="{{ SYNNEFO_MEDIA_URL }}body-bg2.png" />-->


  		





  
  176
  
    
    <!--<img id="okeanos-image" src="{{ SYNNEFO_IMAGES_URL }}body-bg2.png" />-->


  		





  177
  177
  
    
    <div id="container">


  		





  178
  178
  
    
        <div id="header">


  		





  179
  179
  
    
            <div id="user">


  		





  ......




  502
  502
  
    
    </div>


  		





  503
  503
  
    
    


  		





  504
  504
  
    
    <div id="loading-view" class="hidden">


  		





  505
  
  
    
        <img src="{{ SYNNEFO_MEDIA_URL }}images/icons/indicators/small/progress.gif" />


  		





  
  505
  
    
        <img src="{{ SYNNEFO_IMAGES_URL }}icons/indicators/small/progress.gif" />


  		





  506
  506
  
    
        <div class="header">Loading <span>~okeanos</span></div>


  		





  507
  507
  
    
        <div class="info hidden"></div>


  		





  508
  508
  
    
    </div>


  		












  

    
      b/ui/templates/machines_console.html
    
  






  61
  61
  
    
            <div class="help-text">{% trans "This is a slow connection meant only for troubleshooting. For an optimal experience use the machine's Connect button on the main panel." %}</div>


  		





  62
  62
  
    
        </div>


  		





  63
  63
  
    
        <div class="console-container">


  		





  64
  
  
    
            <applet code="VncViewer.class" archive="{{ SYNNEFO_MEDIA_URL }}vncviewer/VncViewer.jar">


  		





  
  64
  
    
            <applet code="VncViewer.class" archive="{{ UI_MEDIA_URL }}extra/vncviewer/VncViewer.jar">


  		





  65
  65
  
    
                <param name="HOST" value="{{host}}"></param>


  		





  66
  66
  
    
                <param name="PORT" value="{{port}}"></param>


  		





  67
  67
  
    
                <param name="PASSWORD" value="{{password}}"></param>


  		












  

    
      b/ui/views.py
    
  






  71
  71
  
    
SKIP_TIMEOUTS = getattr(settings, "UI_SKIP_TIMEOUTS", 1)


  		





  72
  72
  
    

  		





  73
  73
  
    
# MEDIA PATHS


  		





  74
  
  
    
UI_MEDIA_URL = getattr(settings, "MEDIA_URL", "/static/")


  		





  75
  
  
    
UI_SYNNEFO_MEDIA_URL = getattr(settings,


  		





  76
  
  
    
                    "UI_SYNNEFO_MEDIA_URL", UI_MEDIA_URL + "snf-%s/" % SYNNEFO_JS_LIB_VERSION)


  		





  
  74
  
    
UI_MEDIA_URL = getattr(settings, "UI_MEDIA_URL",


  		





  
  75
  
    
                    "%ssnf-%s/" % (settings.MEDIA_URL, SYNNEFO_JS_LIB_VERSION))


  		





  77
  76
  
    
UI_SYNNEFO_IMAGES_URL = getattr(settings,


  		





  78
  
  
    
                    "UI_SYNNEFO_IMAGES_URL", UI_SYNNEFO_MEDIA_URL + "images/")


  		





  
  77
  
    
                    "UI_SYNNEFO_IMAGES_URL", UI_MEDIA_URL + "images/")


  		





  79
  78
  
    
UI_SYNNEFO_CSS_URL = getattr(settings,


  		





  80
  
  
    
                    "UI_SYNNEFO_CSS_URL", UI_SYNNEFO_MEDIA_URL + "css/")


  		





  
  79
  
    
                    "UI_SYNNEFO_CSS_URL", UI_MEDIA_URL + "css/")


  		





  81
  80
  
    
UI_SYNNEFO_JS_URL = getattr(settings,


  		





  82
  
  
    
                    "UI_SYNNEFO_JS_URL", UI_SYNNEFO_MEDIA_URL + "js/")


  		





  
  81
  
    
                    "UI_SYNNEFO_JS_URL", UI_MEDIA_URL + "js/")


  		





  83
  82
  
    
UI_SYNNEFO_JS_LIB_URL = getattr(settings,


  		





  84
  83
  
    
                    "UI_SYNNEFO_JS_LIB_URL", UI_SYNNEFO_JS_URL + "lib/")


  		





  85
  84
  
    
UI_SYNNEFO_JS_WEB_URL = getattr(settings,


  		





  ......




  92
  91
  
    
    t = loader.get_template(current_template)


  		





  93
  92
  
    
    media_context = {


  		





  94
  93
  
    
       'UI_MEDIA_URL': UI_MEDIA_URL,


  		





  95
  
  
    
       'SYNNEFO_MEDIA_URL': UI_SYNNEFO_MEDIA_URL,


  		





  96
  94
  
    
       'SYNNEFO_JS_URL': UI_SYNNEFO_JS_URL,


  		





  97
  95
  
    
       'SYNNEFO_JS_LIB_URL': UI_SYNNEFO_JS_LIB_URL,


  		





  98
  96
  
    
       'SYNNEFO_JS_WEB_URL': UI_SYNNEFO_JS_WEB_URL,


  		












Also available in:
  Unified diff