shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature-1727

Browse Source
This commit is contained in:
Carlos Martín 2015-07-20 16:51:20 +02:00
commit f7cf7a7123
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install.sh
View File

@ -306,15 +306,16 @@ VAR_DIRS="$VAR_LOCATION/remotes \
SUNSTONE_DIRS="$SUNSTONE_LOCATION/routes \
$SUNSTONE_LOCATION/models \
$SUNSTONE_LOCATION/models/OpenNebulaJSON \
$SUNSTONE_LOCATION/public \
$SUNSTONE_LOCATION/views"
SUNSTONE_MINIFIED_DIRS="SUNSTONE_LOCATION/public \
$SUNSTONE_LOCATION/public/dist \
$SUNSTONE_LOCATION/public/dist/console \
$SUNSTONE_LOCATION/public/css \
$SUNSTONE_LOCATION/public/bower_components/fontawesome/fonts \
$SUNSTONE_LOCATION/public/locale/languages \
$SUNSTONE_LOCATION/public/images \
$SUNSTONE_LOCATION/public/images/logos \
$SUNSTONE_LOCATION/views"
$SUNSTONE_LOCATION/public/images/logos"
ONEFLOW_DIRS="$ONEFLOW_LOCATION/lib \
$ONEFLOW_LOCATION/lib/strategy \
@ -344,9 +345,16 @@ if [ "$CLIENT" = "yes" ]; then
elif [ "$ONEGATE" = "yes" ]; then
MAKE_DIRS="$MAKE_DIRS $LIB_OCA_CLIENT_DIRS"
elif [ "$SUNSTONE" = "yes" ]; then
if [ "$SUNSTONE_DEV" = "no" ]; then
MAKE_DIRS="$MAKE_DIRS $SUNSTONE_DIRS $SUNSTONE_MINIFIED_DIRS $LIB_OCA_CLIENT_DIRS"
else
MAKE_DIRS="$MAKE_DIRS $SUNSTONE_DIRS $LIB_OCA_CLIENT_DIRS"
fi
elif [ "$ONEFLOW" = "yes" ]; then
MAKE_DIRS="$MAKE_DIRS $ONEFLOW_DIRS $LIB_OCA_CLIENT_DIRS"
elif [ "$SUNSTONE_DEV" = "no" ]; then
MAKE_DIRS="$MAKE_DIRS $SHARE_DIRS $ETC_DIRS $LIB_DIRS $VAR_DIRS \
$SUNSTONE_DIRS $SUNSTONE_MINIFIED_DIRS $ONEFLOW_DIRS"
else
MAKE_DIRS="$MAKE_DIRS $SHARE_DIRS $ETC_DIRS $LIB_DIRS $VAR_DIRS \
$SUNSTONE_DIRS $ONEFLOW_DIRS"

6
src/sunstone/views/login.erb
View File

@ -10,7 +10,11 @@
<script type="text/javascript" src="vendor/crypto-js/enc-base64-min.js"></script>
<![endif]-->
<script src="dist/login.js"></script>
<% if $conf[:env] == 'dev' %>
<script src="bower_components/requirejs/require.js" data-main="app/login"></script>
<% else %>
<script src="dist/login.js"></script>
<% end %>
</head>
<body>