[ui] switched webapp to angular 1.2 with updated angular seed

This commit is contained in:
Papa Balyo 2013-10-16 23:54:37 -07:00 committed by Maxim Kulkin
parent 695018aeb2
commit 25ffc2fb3b
3 changed files with 3 additions and 3 deletions

View File

@ -15,11 +15,9 @@
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery.address/1.6/jquery.address.js"></script>
<script src="/static/semantic-ui/packaged/javascript/semantic.js"></script>
<script src="/static/lib/angular.min.js"></script>
<script src="/static/lib/moment.min.js"></script>
<link rel="stylesheet" type="text/css" href="/static/css/main.css">
<script src="/static/js/main.js"></script>
</head>
<body>

View File

@ -1,3 +1,4 @@
'use strict';
/* Controllers */
@ -36,4 +37,5 @@ angular.module('rubick.controllers', []).
$scope.newCluster = undefined;
$('#add-cluster-modal').modal('hide');
}
}])

View File

@ -166,7 +166,7 @@ def get_clusters():
#return json.dumps([Cluster.from_doc(doc) for doc in db['clusters'].find()])
return json.dumps([
Cluster('cluster1', "Kirill's DevStack", description="Grizzly-based devstack with Quantum and oVS, deployed on Kirill's laptop", status='Available'),
Cluster('cluster2', "Peter's DevStack", description="Grizzly-based devstack deployed on Peter Lomakin's workstation with nova-network and FlatDHCP manager", status='Broken')
#Cluster('cluster2', "Peter's DevStack", description="Grizzly-based devstack deployed on Peter Lomakin's workstation with nova-network and FlatDHCP manager", status='Broken')
])
@app.route('/clusters', methods=['POST'])