solved #387, #377(moved), #335, #307 and added #300,#337,#302 as low …

…priority
FlowzPlatform · Feb 23, 2018 · 657edcd · 657edcd
1 parent 2863de7
commit 657edcd
Show file tree

Hide file tree

Showing 3 changed files with 203 additions and 162 deletions.
diff --git a/src/views/PageSettings.vue b/src/views/PageSettings.vue
@@ -255,7 +255,9 @@
                                         <el-button class="pull-right" style="min-width: 100%;" type="danger" @click="deletelocalscripts(index)" icon="delete2"></el-button>
                                      </div>
                                      <div class="col-md-1">
-                                        <el-button style="min-width: 100%;"><i class="fa fa-arrows"></i></el-button>
+                                        <el-tooltip class="item" effect="dark" content="Re-position" placement="top-start">
+                                          <el-button style="min-width: 100%;" icon="d-caret"></el-button>
+                                      </el-tooltip>
                                      </div>
                                   </div>
                                </draggable>
@@ -306,7 +308,9 @@
                                         <el-button class="pull-right" style="min-width: 100%;" type="danger" @click="deletelocalstyles(index)" icon="delete2"></el-button>
                                      </div>
                                      <div class="col-md-1">
-                                        <el-button style="min-width: 100%;"><i class="fa fa-arrows"></i></el-button>
+                                      <el-tooltip class="item" effect="dark" content="Re-position" placement="top-start">
+                                        <el-button style="min-width: 100%;" icon="d-caret"></el-button>
+                                      </el-tooltip>
                                      </div>
                                   </div>
                                </draggable>

diff --git a/src/views/ProjectSettings.vue b/src/views/ProjectSettings.vue
@@ -122,7 +122,7 @@
                   </el-select></el-col>
                   <el-col :span='4'>
                   <el-tooltip content="To change/add CRM Setting" placement="top">
-                  <el-button type="primary" icon='setting' href='https://www.crm.flowzcluster.tk/'>CRM Setting</el-button></el-tooltip></el-col>
+                  <el-button type="primary" icon='setting' @click='linktocrm()'>CRM Setting</el-button></el-tooltip></el-col>
                   </el-row>
                 </el-form-item>
 
@@ -1382,6 +1382,9 @@ export default {
   },
 
   methods: {
+    linktocrm(){
+      window.open('https://crm.'+config.domainkey);
+    },
 
     setPrimaryRole(index){
       for(var i = 0; i < this.websiteRoles.length ; i++){