From 24a97173cd8d876eb031f22fea6f949f762b838e Mon Sep 17 00:00:00 2001 From: scorpionis Date: Wed, 23 Mar 2016 08:14:21 +0800 Subject: [PATCH 1/9] fix and modify some documents --- README.md | 8 +++----- prepare.sh | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0c25ad4..628afbe 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,6 @@ src/ ... web/ web.py -dep/ - etcd-multi-nodes.sh - etcd-one-node.sh doc/ tools/ update-basefs.sh @@ -131,9 +128,10 @@ file system. ### etcd ### -For single host environment, start **dep/etcd-one-node.sh** . Some recent +For single host environment, start **tools/etcd-one-node.sh** . Some recent Ubuntu releases have included **etcd** in the repository, just `apt-get -install etcd`, and it need not to start etcd manually. +install etcd`, and it need not to start etcd manually. For others, you +should install etcd manually. For multi hosts distributed environment, start **dep/etcd-multi-nodes.sh** in each etcd server hosts. This scripts diff --git a/prepare.sh b/prepare.sh index c85a199..f53b058 100755 --- a/prepare.sh +++ b/prepare.sh @@ -37,12 +37,12 @@ apt-get install -y etcd # check and install configurable-http-proxy which configurable-http-proxy &>/dev/null || npm install -g configurable-http-proxy -which configurable-http-proxy &>/dev/null || { echo "Error : install configurable-http-proxy failed, you should try again" && exit 1; } +which configurable-http-proxy &>/dev/null || { echo "Error: install configurable-http-proxy failed, you should try again" && exit 1; } [[ -f conf/docklet.conf ]] || { echo "Generating docklet.conf from template" && cp conf/docklet.conf.template conf/docklet.conf; } echo "" -echo "All preparation installation is done." +echo "All preparation installations are done." echo "****************************************" echo "* Please Read Lines Below Before Start *" echo "****************************************" @@ -51,8 +51,8 @@ echo "" echo "Before staring : you need a basefs image. " echo "basefs images are provided at: " echo " http://docklet.unias.org/download" -echo "Please download it to FS_PREFIX/local and then extract it. (defalut FS_PRERIX is /opt/docklet)" -echo "Probably you will get a dicectory structure like" +echo "please download it to FS_PREFIX/local and then extract it. (defalut FS_PRERIX is /opt/docklet)" +echo "you will get a dicectory structure like" echo " /opt/docklet/local/basefs/etc " echo " /opt/docklet/local/basefs/bin " echo " /opt/docklet/local/basefs/..." From 1936fb6ce465789869e46e912ad8e65142b3c560 Mon Sep 17 00:00:00 2001 From: leebaok Date: Fri, 1 Apr 2016 16:56:05 +0800 Subject: [PATCH 2/9] hot fix of external login of web --- web/templates/login.html | 2 +- web/webViews/authenticate/login.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/templates/login.html b/web/templates/login.html index cfc7a55..91bab74 100755 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -54,7 +54,7 @@ Facebook Sign in using Google+ - {{ link }} + {{ link }} diff --git a/web/webViews/authenticate/login.py b/web/webViews/authenticate/login.py index bdf728f..d54e70d 100755 --- a/web/webViews/authenticate/login.py +++ b/web/webViews/authenticate/login.py @@ -40,10 +40,12 @@ class loginView(normalView): #refreshInfo() return redirect(request.args.get('next',None) or '/dashboard/') if (env.getenv('EXTERNAL_LOGIN') == 'True'): + url = external_generate.external_login_url link = external_generate.external_login_link else: link = '' - return render_template(self.template_path, link = link) + url = '' + return render_template(self.template_path, link = link, url = url) @classmethod def post(self): From e9dfd7b395c78899b6dea5723efc45c2b81bddbc Mon Sep 17 00:00:00 2001 From: Peidong Liu Date: Mon, 4 Apr 2016 21:13:19 +0800 Subject: [PATCH 3/9] Now updating userinfo take effects immediately Change background color of profile and signout button --- web/templates/base_AdminLTE.html | 2 +- web/webViews/authenticate/login.py | 22 ++++++++++++---------- web/webViews/user/userinfo.py | 2 ++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/web/templates/base_AdminLTE.html b/web/templates/base_AdminLTE.html index 51f6afc..43035b4 100644 --- a/web/templates/base_AdminLTE.html +++ b/web/templates/base_AdminLTE.html @@ -77,7 +77,7 @@ -