Fixed auth error view, rewrite modals

2025-08-12 19:13:57 +02:00 · 2020-07-10 05:34:00 +03:00
parent ac0708ce01
commit 538e249aec
20 changed files with 364 additions and 305 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +0,0 @@
-dist/ifm.php        -diff
-dist/ifm.min.php    -diff
-dist/*              -diff
-src/includes/ace.js	-diff
-
-src             export-ignore
-compiler.php    export-ignore
-.gitignore      export-ignore
-.gitattributes  export-ignore
--- a/compiler.php
+++ b/compiler.php
@@ -10,7 +10,7 @@ chdir( realpath( dirname( __FILE__ ) ) );

 // output files and common attrs
 define( "IFM_CDN",           false );
-define( "IFM_VERSION",       "<a href='https://github.com/misterunknown/ifm/tree/v2.6.1' target=_blank>v2.6.1</a>" );
+define( "IFM_VERSION",       "v2.6.2" );
 define( "IFM_RELEASE_DIR",   "dist/");
 define( "IFM_STANDALONE",    "ifm.php" );
 define( "IFM_STANDALONE_GZ", "ifm.min.php" );
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -101,7 +101,7 @@
    "toggle_nav": "Переключить вид",
    "upload": "Загрузить",
    "upload_drop": "Перетащите файлы для загрузки",
-    "upload_file": "Загрузить файла",
+    "upload_file": "Загрузить файл",
    "upload_remote": "Удаленная загрузка",
    "upload_remote_url": "Удаленная загрузка по URL",
    "username": "Имя пользователя",
--- a/src/ifm.js
+++ b/src/ifm.js
@@ -1394,9 +1394,11 @@ function IFM(params) {
 					if( newFooter.style.maxHeight == '80%' ) {
 						newFooter.style.maxHeight = '6em';
 						newFooter.style.overflow = 'hidden';
+						newFooter.hidden = true;
 					} else {
 						newFooter.style.maxHeight = '80%';
 						newFooter.style.overflow = 'scroll';
+						newFooter.hidden = false;
 					}
 				}
 			});
--- a/src/ifmarchive.php
+++ b/src/ifmarchive.php
@@ -32,17 +32,16 @@ class IFMArchive {
 			if ($f != '.' && $f != '..') {
 				$filePath = $folder . '/' . $f;
 				if (file_exists($filePath) && is_readable($filePath))
-					if (is_file($filePath)) {
+					if (is_file($filePath))
 						if (!is_callable($exclude_callback) || $exclude_callback($f))
 							$archive->addFile( $filePath, substr( $filePath, $offset ) );
-					} elseif (is_dir($filePath)) {
+					elseif (is_dir($filePath))
 						if (is_callable($exclude_callback))
 							self::addFolder($archive, $filePath, $offset, $exclude_callback);
 						else
 							self::addFolder($archive, $filePath, $offset);
 			}
 		}
-		}
 		closedir($handle);
 	}

@@ -56,7 +55,7 @@ class IFMArchive {
 		if (!is_array($src))
 			$src = array($src);

-		//file_put_contents("debug.ifm.log", var_export(is_callable($exclude_callback), true)."\n");
+		file_put_contents("debug.ifm.log", var_export(is_callable($exclude_callback), true)."\n");

 		foreach ($src as $s)
 			if (is_dir($s))
--- a/src/main.php
+++ b/src/main.php
@@ -62,7 +62,7 @@ class IFM {
 	private $config = array();
 	private $templates = array();
 	private $i18n = array();
-	public $mode = "";
+	public $mode = "standalone";

 	public function __construct( $config=array() ) {

@@ -218,7 +218,7 @@ IFM_ASSETS
 				<title>IFM - improved file manager</title>
 				<meta charset="utf-8">
 				<meta http-equiv="X-UA-Compatible" content="IE=edge">
-				<meta name="viewport" content="width=device-width, initial-scale=1">';
+				<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">';
 		$this->getCSS();
 		print '</head><body>';
 	}
@@ -994,13 +994,16 @@ IFM_ASSETS

 		if( ! isset( $_SESSION['ifmauth'] ) || $_SESSION['ifmauth'] !== true ) {
 			$login_failed = false;
+			$login_message = "";
 			if( isset( $_POST["inputLogin"] ) && isset( $_POST["inputPassword"] ) ) {
-				if( $this->checkCredentials( $_POST["inputLogin"], $_POST["inputPassword"] ) ) {
+				$state = $this->checkCredentials( $_POST["inputLogin"], $_POST["inputPassword"] );
+				if($state['status']) {
 					$_SESSION['ifmauth'] = true;
 				}
 				else {
 					$_SESSION['ifmauth'] = false;
 					$login_failed = true;
+					$login_message = $state['message'];
 				}
 			}

@@ -1013,7 +1016,7 @@ IFM_ASSETS
 					else
 						$this->jsonResponse( array( "status"=>"ERROR", "message"=>"not authenticated" ) );
 				} else {
-					$this->loginForm($login_failed);
+					$this->loginForm($login_failed, $login_message);
 				}
 				return false;
 			}
@@ -1023,6 +1026,7 @@ IFM_ASSETS
 	}

 	private function checkCredentials( $user, $pass ) {
+		$authenticated = array("status" => false, "message" =>  "");
 		list( $src, $srcopt ) = explode( ";", $this->config['auth_source'], 2 );
 		switch( $src ) {
 			case "inline":
@@ -1035,12 +1039,11 @@ IFM_ASSETS
 					$htpasswd = new Htpasswd( $srcopt );
 					return $htpasswd->verify( $user, $pass );
 				} else {
-					trigger_error( "IFM: Fatal: Credential file does not exist or is not readable" );
-					return false;
+					// trigger_error( "IFM: Fatal: Credential file does not exist or is not readable" );
+					return $authenticated;
 				}
 				break;
 			case "ldap":
-				$authenticated = false;
 				$ldapopts = explode( ";", $srcopt );
 				if( count( $ldapopts ) === 3 ) {
 					list( $ldap_server, $rootdn, $ufilter ) = explode( ";", $srcopt );
@@ -1050,8 +1053,8 @@ IFM_ASSETS
 				}
 				$u = "uid=" . $user . "," . $rootdn;
 				if( ! $ds = ldap_connect( $ldap_server ) ) {
-					trigger_error( "Could not reach the ldap server.", E_USER_ERROR );
-					return false;
+					$authenticated['status'] = false;
+					$authenticated['message'] = "Could not reach the ldap server.";
 				}
 				ldap_set_option( $ds, LDAP_OPT_PROTOCOL_VERSION, 3 );
 				if( $ds ) {
@@ -1059,31 +1062,32 @@ IFM_ASSETS
 					if( $ldbind ) {
 						if( $ufilter ) {
 							if( ldap_count_entries( $ds, ldap_search( $ds, $rootdn, $ufilter ) ) > 0 ){
-								$authenticated = true;
+								$authenticated['status'] = true;
 							} else {
-								trigger_error( "User not allowed.", E_USER_ERROR );
-								$authenticated = false;
+								$authenticated['status'] = false;
+								$authenticated['message'] = "User not allowed.";
 							}
 						} else {
-							$authenticated = true;
+							$authenticated['status'] = true;
 						}
 					} else {
-						trigger_error( ldap_error( $ds ), E_USER_ERROR );
-						$authenticated = false;
+						$authenticated['status'] = false;
+						$authenticated['message'] = ldap_error( $ds );
 					}
 					ldap_unbind( $ds );
-				} else
-					$authenticated = false;
+				} else {
+					$authenticated['status'] = false;
+				}					
 				return $authenticated;
 				break;
 		}
-		return false;
+		return $authenticated;
 	}

-	private function loginForm($loginFailed=false) {
+	private function loginForm($loginFailed=false, $loginMessage) {
 		$err = "";
 		if( $loginFailed ) 
-			$err = '<div class="alert alert-primary" role="alert">'.$this->l['login_failed'].'</div>';
+			$err = '<div class="alert alert-danger" role="alert">'.$loginMessage.'</div>';
 		$this->getHTMLHeader();
 		$html = str_replace( "{{error}}", $err, $this->templates['login'] );
 		$html = str_replace( "{{i18n.username}}", $this->l['username'], $html );
--- a/src/templates/app.html
+++ b/src/templates/app.html
@@ -100,8 +100,8 @@
 	<div class="container">
 		<div class="card ifminfo">
 			<div class="card-body p-2">
-                <div style="float:left; padding-left: 10px;">{{i18n.footer}} IFM_VERSION</div>
-                <a style="float:right; padding-right: 10px;" href="http://github.com/misterunknown/ifm">{{i18n.github}}</a>
+				<div style="float:left; padding-left: 10px;">{{i18n.footer}} <a href='https://github.com/misterunknown/ifm/tree/IFM_VERSION' target=_blank>IFM_VERSION</a></div>
+				<a style="float:right; padding-right: 10px;" href="http://github.com/misterunknown/ifm" target="_blank">{{i18n.github}}</a>
 			</div>
 		</div>
 	</div>
--- a/src/templates/login.html
+++ b/src/templates/login.html
@@ -107,6 +107,7 @@ body {
  <div class="text-center mb-4">
  	<h1 class="h3 mb-3 font-weight-normal">IFM {{i18n.login}}</h1>
  </div>
+  {{error}}
  <div class="form-label-group">
    <input type="text" name="inputLogin" id="inputLogin" class="form-control" placeholder="{{i18n.username}}" required="" autofocus="">
    <label for="inputLogin">{{i18n.username}}</label>
@@ -115,6 +116,8 @@ body {
    <input type="password" name="inputPassword" id="inputPassword" class="form-control" placeholder="{{i18n.password}}" required="">
    <label for="inputPassword">{{i18n.password}}</label>
  </div>
+  <div class="alert alert-danger d-none" role="alert"></div>
+   
  <button class="btn btn-lg btn-primary btn-block" type="submit">{{i18n.login}}</button>
  
 </form>
--- a/src/templates/modal.ajaxrequest.html
+++ b/src/templates/modal.ajaxrequest.html
@@ -1,16 +1,31 @@
 <form id="formAjaxRequest">
 <div class="modal-body">
 	<fieldset>
-		<label>URL</label><br>
-		<input class="form-control" type="text" id="ajaxurl" required><br>
-		<label>{{i18n.data}}</label><br>
-		<textarea class="form-control" id="ajaxdata"></textarea><br>
-		<label>{{i18n.method}}</label><br>
-		<input type="radio" name="arMethod" value="GET">GET</input><input type="radio" name="arMethod" value="POST" checked="checked">POST</input><br>
-		<button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button>
-		<button type="button" class="btn btn-secondary" id="buttonClose">{{i18n.cancel}}</button><br>
-		<label>{{i18n.response}}</label><br>
-		<textarea class="form-control" id="ajaxresponse"></textarea>
-	</fieldset>
-</form>
+		<div class="form-group">
+			<label for="ajaxurl">URL</label>
+			<input class="form-control" type="url" id="ajaxurl" required>
 		</div>
+		<div class="form-group">
+			<label for="ajaxdata">{{i18n.data}}</label>
+			<textarea class="form-control" id="ajaxdata"></textarea>
+		</div>
+		<div class="form-group">
+			<legend>{{i18n.method}}</legend>
+			<div class="form-check form-check-inline">
+				<input class="form-check-input" type="radio" id="radioget" name="arMethod" value="GET">
+				<label class="form-check-label" for="radioget">GET</label>
+			</div>
+			<div class="form-check form-check-inline">
+				<input class="form-check-input" type="radio" id="radiopost" name="arMethod" value="POST" checked="checked">
+				<label class="form-check-label" for="radiopost">POST</label>
+			</div>
+		</div>
+		<button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button>
+		<button type="button" class="btn btn-danger" id="buttonClose">{{i18n.cancel}}</button>
+		<div class="form-group">
+			<label for="ajaxresponse">{{i18n.response}}</label>
+			<textarea class="form-control" id="ajaxresponse"></textarea>
+		</div>
+	</fieldset>
+</div>
+</form>
--- a/src/templates/modal.copymove.html
+++ b/src/templates/modal.copymove.html
@@ -1,13 +1,15 @@
 <form id="formCopyMove">
 <fieldset>
 	<div class="modal-body">
-		<label>{{i18n.select_destination}}:</label>
+		<div class="form-group">
+			<label for="copyMoveTree">{{i18n.select_destination}}:</label>
 			<div id="copyMoveTree"><div class="text-center"><span class="icon icon-spin5 animate-spin"></span></div></div>
 		</div>
+	</div>
 	<div class="modal-footer">
 		<button type="button" class="btn btn-secondary" id="copyButton">{{i18n.copy}}</button>
 		<button type="button" class="btn btn-secondary" id="moveButton">{{i18n.move}}</button>
-		<button type="button" class="btn btn-secondary" id="cancelButton">{{i18n.cancel}}</button>
+		<button type="button" class="btn btn-danger" id="cancelButton">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
--- a/src/templates/modal.createarchive.html
+++ b/src/templates/modal.createarchive.html
@@ -1,12 +1,14 @@
 <form id="formCreateArchive">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.archivename}}:</label>
-		<input class="form-control" type="text" name="archivename" value="" />
+		<div class="form-group">
+			<label for="archivename">{{i18n.archivename}}:</label>
+			<input id="archivename" class="form-control" type="text" name="archivename" value="" />
+		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-secondary" id="buttonSave">{{i18n.save}}</button>
-	<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button>
+	<button type="button" class="btn btn-success" id="buttonSave">{{i18n.save}}</button>
+	<button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
--- a/src/templates/modal.createdir.html
+++ b/src/templates/modal.createdir.html
@@ -1,12 +1,14 @@
 <form id="formCreateDir">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.directoryname}}:</label>
-		<input class="form-control" type="text" name="dirname" value="" />
+		<div class="form-group">
+			<label for="dirname">{{i18n.directoryname}}:</label>
+			<input class="form-control" id="dirname" type="text" name="dirname" value="" />
+		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-secondary" id="buttonSave">{{i18n.save}}</button>
-	<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button>
+	<button type="button" class="btn btn-success" id="buttonSave">{{i18n.save}}</button>
+	<button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
--- a/src/templates/modal.extractfile.html
+++ b/src/templates/modal.extractfile.html
@@ -1,29 +1,37 @@
 <form id="formExtractFile">
 <div class="modal-body">
 	<fieldset>
+		<div class="form-group">
 			<label>{{i18n.extract_filename}} {{filename}}:</label>
 			<div class="input-group">
 				<div class="input-group-prepend">
-				<span class="input-group-text"><input type="radio" name="extractTargetLocation" value="./" checked="checked"></span>
+					<div class="input-group-text">
+						<input type="radio" name="extractTargetLocation" value="./" checked="checked">
 					</div>
-			<span class="form-control">./</span>
+				</div>
+				<input class="form-control" type="text" placeholder="./" readonly>
 			</div>
 			<div class="input-group">
 				<div class="input-group-prepend">
-				<span class="input-group-text"><input type="radio" name="extractTargetLocation" value="./{{destination}}"></span>
+					<div class="input-group-text">
+						<input type="radio" name="extractTargetLocation" value="./{{destination}}">
 					</div>
-			<span class="form-control">./{{destination}}</span>
+				</div>
+				<input class="form-control" type="text" placeholder="./{{destination}}" readonly>
 			</div>
 			<div class="input-group">
 				<div class="input-group-prepend">
-				<span class="input-group-text"><input type="radio" name="extractTargetLocation" value="custom"></span>
+					<div class="input-group-text">
+						<input type="radio" name="extractTargetLocation" value="custom">
+					</div>
 				</div>
 				<input id="extractCustomLocation" type="text" class="form-control" placeholder="custom location" value="">
 			</div>
+		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-secondary" id="buttonExtract">{{i18n.extract}}</button>
-	<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button>
+	<button type="button" class="btn btn-primary" id="buttonExtract">{{i18n.extract}}</button>
+	<button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
--- a/src/templates/modal.file.html
+++ b/src/templates/modal.file.html
@@ -1,15 +1,17 @@
 <form id="formFile">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.filename}}:</label>
-		<input type="text" class="form-control" name="filename" value="{{filename}}"><br>
-		<div id="content" name="content"></div><br>
+		<div class="form-group">
+			<label for="filename">{{i18n.filename}}:</label>
+			<input type="text" class="form-control" name="filename" id="filename" value="{{filename}}">
+		</div>
+		<div class="form-group" id="content" name="content"></div>
 		<button type="button" class="btn btn-secondary" id="editoroptions">{{i18n.editor_options}}</button>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" id="buttonSave" class="btn btn-secondary">{{i18n.save}}</button>
-	<button type="button" id="buttonSaveNotClose" class="btn btn-secondary">{{i18n.save_wo_close}}</button>
-	<button type="button" id="buttonClose" class="btn btn-secondary">{{i18n.close}}</button>
+	<button type="button" id="buttonSave" class="btn btn-primary">{{i18n.save}}</button>
+	<button type="button" id="buttonSaveNotClose" class="btn btn-success">{{i18n.save_wo_close}}</button>
+	<button type="button" id="buttonClose" class="btn btn-danger">{{i18n.close}}</button>
 </div>
 </form>
--- a/src/templates/modal.file_editoroptions.html
+++ b/src/templates/modal.file_editoroptions.html
@@ -1,6 +1,7 @@
-<div>
-<div class="form-check p-0">
-<input type="checkbox" id="editor-wordwrap" 
+<form>
+	<div class="form-group">
+		<div class="form-check">
+			<input class="form-check-input" type="checkbox" id="editor-wordwrap" 
 				{{#wordwrap}}
 				checked="checked"
 				{{/wordwrap}}
@@ -15,8 +16,13 @@
 			>
 			<label class="form-check-label" for="editor-softtabs">{{i18n.soft_tabs}}</label>
 		</div>
+	</div>
 	<div class="input-group">
-    <div class="input-group-prepend"><span class="input-group-text">{{i18n.tab_size}}</span></div><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}"></div>
+		<div class="input-group-prepend">
+			<span class="input-group-text" id="editor-tabsize-label">{{i18n.tab_size}}</span>
+		</div>
+		<input class="form-control" type="number" min="1" max="9" maxlength="1" id="editor-tabsize" title="{{i18n.tab_size}}" value="{{tabsize}}" aria-describedby="editor-tabsize-label">
+	</div>
 	{{#ace_includes}}
 	<select class="form-control selectpicker" data-toggle="dropdown" data-live-search="true" data-size="15" id="editor-syntax">
 		{{#modes}}
@@ -24,4 +30,4 @@
 		{{/modes}}
 	</select>
 	{{/ace_includes}}
-</div>
+</form>
--- a/src/templates/modal.remoteupload.html
+++ b/src/templates/modal.remoteupload.html
@@ -1,16 +1,29 @@
 <form id="formRemoteUpload">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.upload_remote_url}}</label><br>
-		<input class="form-control" type="text" id="url" name="url" required><br>
-		<label>{{i18n.filename}}</label>
-		<input class="form-control" type="text" id="filename" name="filename" required><br>
-		<label>{{i18n.method}}</label>
-		<input type="radio" name="method" value="curl" checked="checked">cURL<input type="radio" name="method" value="file">file</input><br>
+		<div class="form-group">
+			<label for="url">{{i18n.upload_remote_url}}</label>
+			<input class="form-control" type="url" id="url" name="url" required>
+		</div>
+		<div class="form-group">
+			<label for="filename">{{i18n.filename}}</label>
+			<input class="form-control" type="text" id="filename" name="filename" required>
+		</div>
+		<div class="form-group">
+			<legend>{{i18n.method}}</legend>
+			<div class="form-check form-check-inline">
+				<input class="form-check-input" type="radio" id="radiocurl" name="method" value="curl" checked="checked">
+				<label class="form-check-label" for="radiocurl">cURL</label>
+			</div>
+			<div class="form-check form-check-inline">
+				<input class="form-check-input" type="radio" id="radiofile" name="method" value="file">
+				<label class="form-check-label" for="radiofile">file</label>
+			</div>
+		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-secondary" id="buttonUpload">{{i18n.upload}}</button>
-	<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button>
+	<button type="button" class="btn btn-primary" id="buttonUpload">{{i18n.upload}}</button>
+	<button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
--- a/src/templates/modal.renamefile.html
+++ b/src/templates/modal.renamefile.html
@@ -1,12 +1,14 @@
 <form id="formRenameFile">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.rename_filename}} {{filename}}:</label>
-		<input class="form-control" type="text" name="newname" value="" /><br>
+		<div class="form-group">
+			<label for="newname">{{i18n.rename_filename}} {{filename}}:</label>
+			<input id="newname" class="form-control" type="text" name="newname" value="" />
+		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
 	<button type="button" class="btn btn-secondary" id="buttonRename">{{i18n.file_rename}}</button>
-	<button type="button" class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}} </button>
+	<button type="button" class="btn btn-danger" id="buttonCancel">{{i18n.cancel}} </button>
 </div>
 </form>
--- a/src/templates/modal.search.html
+++ b/src/templates/modal.search.html
@@ -1,8 +1,10 @@
 <form id="searchForm">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.search_pattern}}:</label>
-		<input type="text" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}"><br>
+		<div class="form-group">
+			<label for="searchPattern">{{i18n.search_pattern}}:</label>
+			<input type="search" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}">
+		</div>
 		<table id="searchResults" class="table">
 		</table>
 	</fieldset>
--- a/src/templates/modal.uploadfile.html
+++ b/src/templates/modal.uploadfile.html
@@ -1,14 +1,20 @@
 <form id="formUploadFile">
 <div class="modal-body">
 	<fieldset>
-		<label>{{i18n.upload_file}}</label><br>
-		<input class="form-control-file" type="file" name="files" multiple><br>
-		<label>{{i18n.filename_new}}</label>
-		<input class="form-control" type="text" name="newfilename"><br>
+		<div class="form-group">
+			<div class="custom-file">
+				<label class="custom-file-label" for="fileselect">{{i18n.upload_file}}</label>
+				<input class="custom-file-input" type="file" name="files" id="fileselect" multiple>
+			</div>
+		</div>
+		<div class="form-group">
+			<label for="filename">{{i18n.filename_new}}</label>
+			<input class="form-control" type="text" name="newfilename" id="filename">
+		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button class="btn btn-secondary" id="buttonUpload">{{i18n.upload}}</button>
-	<button class="btn btn-secondary" id="buttonCancel">{{i18n.cancel}}</button>
+	<button class="btn btn-primary" id="buttonUpload">{{i18n.upload}}</button>
+	<button class="btn btn-danger" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>