Merge branch 'main' into feature/user-roles

bin/v-add-sys-rainloop

@@ -103,8 +103,6 @@ if [ "$UPDATE" == "no" ]; then
     echo "Forbidden" >  ./data/index.html
 
     # Create database
-    mysql -e "DROP DATABASE rainloop"
-    mysql -e "DROP USER rainloop@localhost"
     mysql -e "CREATE DATABASE rainloop"
     # Mysql available on system
     r=$(generate_password)
@@ -172,4 +170,4 @@ fi
 #----------------------------------------------------------#
 
 $BIN/v-log-action "system" "Info" "Plugins" "Rainloop enabled (Version: $version)."
-log_event "$OK" "$ARGUMENTS"
+log_event "$OK" "$ARGUMENTS"

web/css/src/themes/dark.css

@@ -1513,6 +1513,11 @@ form#vstobjects.suspended {
   color: #fff !important;
 }
 
+.admin-warning-button {
+    padding-left: 65px!important;
+    padding-right: 65px!important;
+}
+
 @media screen and (max-width: 950px) {
   .helper-container {
     display: none;

web/css/src/themes/default.css

@@ -3672,6 +3672,11 @@ form#vstobjects.suspended {
   max-width: 140px;
 }
 
+.admin-warning-button {
+  padding-left: 59px !important;
+  padding-right: 59px !important;
+}
+
 .float-left {
   float: left;
 }
@@ -4063,6 +4068,7 @@ form#vstobjects.suspended {
   width: 270px;
 }
 
+
 @media screen and (max-width: 950px) {
   .helper-container {
     display: none;

web/templates/admin/add_web.html

@@ -68,8 +68,8 @@
                         <? if (($user == 'admin') && (empty($_GET['accept']))) {?>
                             <tr>
                                 <td class="step-top">
-                                    <span><a href="/add/user/" class="vst-advanced" style="padding-left: 67px !important;padding-right: 67px !important;"><?=_('Add User')?></a></span>
-                                    <span><a href="/add/web/?accept=true" class="vst-advanced" style="padding-left: 67px !important;padding-right: 67px !important;"><?=_('Continue')?></a> </span>
+                                    <span><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User')?></a></span>
+                                    <span><a href="/add/web/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue')?></a> </span>
                                 </td>
                             </tr>
                         <? } ?>