Revision d194e869

b/snf-cyclades-app/synnefo/app_settings/urls.py
35 35 

  		





  36
  36
  
    
urlpatterns = patterns('',


  		





  37
  37
  
    
    (r'^ui/', include('synnefo.ui.urls')),


  		





  38
  
  
    
    url(r'^machines/console$', 'synnefo.ui.views.machines_console', name='machines-console'),


  		





  39
  
  
    
    url(r'^machines/connect$', 'synnefo.ui.views.machines_connect', name='machines-connect'),


  		





  
  38
  
    
    url(r'^machines/console$', 'synnefo.ui.views.machines_console',


  		





  
  39
  
    
        name='ui_machines_console'),


  		





  
  40
  
    
    url(r'^machines/connect$', 'synnefo.ui.views.machines_connect',


  		





  
  41
  
    
        name='ui_machines_connect'),


  		





  40
  42
  
    
    (r'^api/', include('synnefo.api.urls')),


  		





  41
  43
  
    
    (r'^plankton/', include('synnefo.plankton.urls')),


  		





  42
  44
  
    
)


  		












  

    
      b/snf-cyclades-app/synnefo/ui/templates/home.html
    
  






  102
  102
  
    
        var SKIP_TIMEOUTS = {{ skip_timeouts }};


  		





  103
  103
  
    
        var UPDATE_INTERVAL = {{ update_interval }};


  		





  104
  104
  
    
        var APP_DEBUG = {% if DEBUG %}true{% else %}false{% endif %};


  		





  105
  
  
    
        var FEEDBACK_URL = "{% url feedback %}";


  		





  
  105
  
    
        var FEEDBACK_URL = "{% url ui_feedback %}";


  		





  106
  106
  
    
        var FEEDBACK_TITLE = "{% trans "Send feedback" %}";


  		





  107
  107
  
    
        var API_OVERLAY_TITLE = "{% trans "API access" %}";


  		





  108
  108
  
    
        var API_OVERLAY_SUBCONTENT = "{% trans "The API key provides full access to your <em>~okeanos</em> account, so always keep it private." %}";


  		





  ......




  575
  575
  
    
            


  		





  576
  576
  
    
            // TODO: configurable userdata urls in models.js


  		





  577
  577
  
    
            synnefo.config.userdata_url = '/ui/userdata';


  		





  578
  
  
    
            synnefo.config.userdata_keys_url = '{% url keys_collection %}';


  		





  
  578
  
    
            synnefo.config.userdata_keys_url = '{% url ui_keys_collection %}';


  		





  579
  579
  
    
            synnefo.config.userdata_keys_limit = {{ userdata_keys_limit }};


  		





  580
  580
  
    
            


  		





  581
  581
  
    
            // media config


  		












  

    
      b/snf-cyclades-app/synnefo/ui/urls.py
    
  






  36
  36
  
    
import os


  		





  37
  37
  
    

  		





  38
  38
  
    
urlpatterns = patterns('',


  		





  39
  
  
    
    url(r'^$', 'synnefo.ui.views.home', name='index'),


  		





  40
  
  
    
    url(r'^feedback$', 'synnefo.ui.views.feedback_submit', name='feedback'),


  		





  
  39
  
    
    url(r'^$', 'synnefo.ui.views.home', name='ui_index'),


  		





  
  40
  
    
    url(r'^feedback$', 'synnefo.ui.views.feedback_submit', name='ui_feedback'),


  		





  41
  41
  
    
    url(r'userdata/', include('synnefo.ui.userdata.urls'))


  		





  42
  42
  
    
)


  		





  43
  43
  
    

  		












  

    
      b/snf-cyclades-app/synnefo/ui/userdata/tests.py
    
  






  66
  66
  
    
        settings.SKIP_SSH_VALIDATION = True


  		





  67
  67
  
    
        self.client = AaiClient()


  		





  68
  68
  
    
        self.user = 'test'


  		





  69
  
  
    
        self.keys_url = reverse('keys_collection')


  		





  
  69
  
    
        self.keys_url = reverse('ui_keys_collection')


  		





  70
  70
  
    

  		





  71
  71
  
    
    def test_keys_collection_get(self):


  		





  72
  72
  
    
        resp = self.client.get(self.keys_url)


  		












  

    
      b/snf-cyclades-app/synnefo/ui/userdata/urls.py
    
  






  36
  36
  
    
from synnefo.ui.userdata import views


  		





  37
  37
  
    

  		





  38
  38
  
    
urlpatterns = patterns('',


  		





  39
  
  
    
    url(r'^keys$', views.PublicKeyPairCollectionView.as_view('keys_resource'),


  		





  40
  
  
    
        name='keys_collection'),


  		





  
  39
  
    
    url(r'^keys$', views.PublicKeyPairCollectionView.as_view('ui_keys_resource'),


  		





  
  40
  
    
        name='ui_keys_collection'),


  		





  41
  41
  
    
    url(r'^keys/(?P<id>\d+)',


  		





  42
  
  
    
    views.PublicKeyPairResourceView.as_view('keys_resource'),


  		





  43
  
  
    
        name="keys_resource"),


  		





  44
  
  
    
    url(r'keys/generate', views.generate_key_pair, name="generate_public_key"),


  		





  45
  
  
    
    url(r'keys/download', views.download_private_key, name="download_public_key")


  		





  
  42
  
    
    views.PublicKeyPairResourceView.as_view('ui_keys_resource'),


  		





  
  43
  
    
        name="ui_keys_resource"),


  		





  
  44
  
    
    url(r'keys/generate', views.generate_key_pair, name="ui_generate_public_key"),


  		





  
  45
  
    
    url(r'keys/download', views.download_private_key, name="ui_download_public_key")


  		





  46
  46
  
    
)


  		












  

    
      b/snf-cyclades-app/synnefo/ui/views.py
    
  






  283
  283
  
    
    else:


  		





  284
  284
  
    
        link_title = _("Remote desktop to %s") % ip_address


  		





  285
  285
  
    
        link_url = "%s?ip_address=%s&os=%s&rdp=1&srv=%d&username=%s&domain=%s" % (


  		





  286
  
  
    
                reverse("machines-connect"), ip_address, operating_system,int(server_id), username, domain)


  		





  
  286
  
    
                reverse("ui_machines_connect"), ip_address, operating_system,int(server_id), username, domain)


  		





  287
  287
  
    

  		





  288
  288
  
    
        if (operating_system != "windows"):


  		





  289
  289
  
    
            link_title = "ssh %s@%s" % (username, ip_address)


  		












Also available in:
  Unified diff