Merge branch 'master' of https://github.com/filebrowser/filebrowser

cmd/config.go

@@ -42,6 +42,7 @@ func addConfigFlags(flags *pflag.FlagSet) {
 	flags.String("recaptcha.secret", "", "ReCaptcha secret")
 
 	flags.String("branding.name", "", "replace 'File Browser' by this name")
+	flags.String("branding.color", "", "set the theme color")
 	flags.String("branding.files", "", "path to directory with images and custom styles")
 	flags.Bool("branding.disableExternal", false, "disable external links such as GitHub links")
 }
@@ -132,6 +133,7 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut
 	fmt.Fprintf(w, "\tName:\t%s\n", set.Branding.Name)
 	fmt.Fprintf(w, "\tFiles override:\t%s\n", set.Branding.Files)
 	fmt.Fprintf(w, "\tDisable external links:\t%t\n", set.Branding.DisableExternal)
+	fmt.Fprintf(w, "\tColor:\t%s\n", set.Branding.Color)
 	fmt.Fprintln(w, "\nServer:")
 	fmt.Fprintf(w, "\tLog:\t%s\n", ser.Log)
 	fmt.Fprintf(w, "\tPort:\t%s\n", ser.Port)

cmd/config_set.go

@@ -55,6 +55,8 @@ you want to change. Other options will remain unchanged.`,
 				set.Shell = convertCmdStrToCmdArray(mustGetString(flags, flag.Name))
 			case "branding.name":
 				set.Branding.Name = mustGetString(flags, flag.Name)
+			case "branding.color":
+				set.Branding.Color = mustGetString(flags, flag.Name)
 			case "branding.disableExternal":
 				set.Branding.DisableExternal = mustGetBool(flags, flag.Name)
 			case "branding.files":

frontend/public/index.html

@@ -16,7 +16,7 @@
 
   <!-- Add to home screen for Android and modern mobile browsers -->
   <link rel="manifest" id="manifestPlaceholder" crossorigin="use-credentials">
-  <meta name="theme-color" content="#2979ff">
+  <meta name="theme-color" content="[{[ if .Color -]}][{[ .Color ]}][{[ else ]}]#2979ff[{[ end ]}]">
 
   <!-- Add to home screen for Safari on iOS/iPadOS -->
   <meta name="apple-mobile-web-app-capable" content="yes">
@@ -26,7 +26,7 @@
 
   <!-- Add to home screen for Windows -->
   <meta name="msapplication-TileImage" content="[{[ .StaticURL ]}]/img/icons/mstile-144x144.png">
-  <meta name="msapplication-TileColor" content="#2979ff">
+  <meta name="msapplication-TileColor" content="[{[ if .Color -]}][{[ .Color ]}][{[ else ]}]#2979ff[{[ end ]}]">
 
   <!-- Inject Some Variables and generate the manifest json -->
   <script>
@@ -51,7 +51,7 @@
       "start_url": window.location.origin + window.FileBrowser.BaseURL,
       "display": "standalone",
       "background_color": "#ffffff",
-      "theme_color": "#455a64"
+      "theme_color": window.FileBrowser.Color || "#455a64"
     }
 
     const stringManifest = JSON.stringify(dynamicManifest);

frontend/src/components/Sidebar.vue

@@ -1,15 +1,15 @@
 <template>
   <nav :class="{ active }">
     <template v-if="isLogged">
-      <router-link
+      <button
         class="action"
-        to="/files/"
+        @click="toRoot"
         :aria-label="$t('sidebar.myFiles')"
         :title="$t('sidebar.myFiles')"
       >
         <i class="material-icons">folder</i>
         <span>{{ $t("sidebar.myFiles") }}</span>
-      </router-link>
+      </button>
 
       <div v-if="user.perm.create">
         <button
@@ -48,15 +48,15 @@
       <quota v-if="quotaExists"></quota>
 
       <div>
-        <router-link
+        <button
           class="action"
-          to="/settings"
+          @click="toSettings"
           :aria-label="$t('sidebar.settings')"
           :title="$t('sidebar.settings')"
         >
           <i class="material-icons">settings_applications</i>
           <span>{{ $t("sidebar.settings") }}</span>
-        </router-link>
+        </button>
 
         <button
           v-if="
@@ -150,6 +150,14 @@ export default {
     authLogoutURL: () => authLogoutURL,
   },
   methods: {
+    toRoot() {
+      this.$router.push({ path: "/files/" }, () => {});
+      this.$store.commit("closeHovers");
+    },
+    toSettings() {
+      this.$router.push({ path: "/settings" }, () => {});
+      this.$store.commit("closeHovers");
+    },
     help() {
       this.$store.commit("showHover", "help");
     },

frontend/src/components/files/ExtendedImage.vue

@@ -44,6 +44,7 @@ export default {
       lastX: null,
       lastY: null,
       inDrag: false,
+      touches: 0,
       lastTouchDistance: 0,
       moveDisabled: false,
       disabledTimer: null,

frontend/src/components/files/ListingItem.vue

@@ -189,6 +189,9 @@ export default {
       return filesize(this.size);
     },
     humanTime: function () {
+      if (this.user.dateFormat) {
+        return moment(this.modified).format("L LT");
+      }
       return moment(this.modified).fromNow();
     },
     dragStart: function () {

frontend/src/css/header.css

@@ -84,7 +84,8 @@ header .menu-button {
 #search #input {
   background-color: #f5f5f5;
   display: flex;
-  padding: 0.75em;
+  height: 100%;
+  padding: 0em 0.75em;
   border-radius: 0.3em;
   transition: .1s ease all;
   align-items: center;

frontend/src/css/styles.css

@@ -291,18 +291,21 @@ main .spinner .bounce2 {
 /* EDITOR */
 
 #editor-container {
+  display: flex;
+  flex-direction: column;
   background-color: #fafafa;
   position: fixed;
   padding-top: 4em;
   top: 0;
   left: 0;
+  height: 100%;
   width: 100%;
   z-index: 9999;
   overflow: hidden;
 }
 
 #editor-container #editor {
-  height: calc(100vh - 8.4em);
+  flex: 1;
 }
 
 #editor-container .breadcrumbs {

frontend/src/i18n/en_GB.json

@@ -244,6 +244,7 @@
     "rules": "Rules",
     "rulesHelp": "Here you can define a set of allow and disallow rules for this specific user. The blocked files won't show up in the listings and they wont be accessible to the user. We support regex and paths relative to the users scope.\n",
     "scope": "Scope",
+    "setDateFormat": "Set exact date format",
     "settingsUpdated": "Settings updated!",
     "shareDeleted": "Share deleted!",
     "shareDuration": "Share Duration",

frontend/src/views/files/Editor.vue

@@ -4,7 +4,6 @@
       <action icon="close" :label="$t('buttons.close')" @action="close()" />
       <title>{{ req.name }}</title>
 
-      <template #actions>
       <action
         v-if="user.perm.modify"
         id="save-button"
@@ -12,7 +11,6 @@
         :label="$t('buttons.save')"
         @action="save()"
       />
-      </template>
     </header-bar>
 
     <breadcrumbs base="/files" noLink />

frontend/src/views/files/Preview.vue

@@ -241,11 +241,11 @@ export default {
     },
     prev() {
       this.hoverNav = false;
-      this.$router.push({ path: this.previousLink });
+      this.$router.replace({ path: this.previousLink });
     },
     next() {
       this.hoverNav = false;
-      this.$router.push({ path: this.nextLink });
+      this.$router.replace({ path: this.nextLink });
     },
     key(event) {
       if (this.show !== null) {

frontend/src/views/settings/Profile.vue

@@ -7,6 +7,18 @@
         </div>
 
         <div class="card-content">
+          <p>
+            <input type="checkbox" v-model="hideDotfiles" />
+            {{ $t("settings.hideDotfiles") }}
+          </p>
+          <p>
+            <input type="checkbox" v-model="singleClick" />
+            {{ $t("settings.singleClick") }}
+          </p>
+          <p>
+            <input type="checkbox" v-model="dateFormat" />
+            {{ $t("settings.setDateFormat") }}
+          </p>
           <h3>{{ $t("settings.language") }}</h3>
           <languages
             class="input input--block"
@@ -75,6 +87,7 @@ export default {
       passwordConf: "",
       hideDotfiles: false,
       singleClick: false,
+      dateFormat: false,
       locale: "",
     };
   },
@@ -99,6 +112,7 @@ export default {
     this.locale = this.user.locale;
     this.hideDotfiles = this.user.hideDotfiles;
     this.singleClick = this.user.singleClick;
+    this.dateFormat = this.user.dateFormat;
   },
   methods: {
     ...mapMutations(["updateUser", "setLoading"]),
@@ -127,8 +141,9 @@ export default {
           locale: this.locale,
           hideDotfiles: this.hideDotfiles,
           singleClick: this.singleClick,
+          dateFormat: this.dateFormat,
         };
-        await api.update(data, ["locale", "hideDotfiles", "singleClick"]);
+        await api.update(data, ["locale", "hideDotfiles", "singleClick", "dateFormat"]);
         this.updateUser(data);
         this.$showSuccess(this.$t("settings.settingsUpdated"));
       } catch (e) {

http/auth.go

@@ -28,6 +28,7 @@ type userInfo struct {
 	Commands     []string          `json:"commands"`
 	LockPassword bool              `json:"lockPassword"`
 	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
 }
 
 type authToken struct {
@@ -184,6 +185,7 @@ func printToken(w http.ResponseWriter, _ *http.Request, d *data, user *users.Use
 			LockPassword: user.LockPassword,
 			Commands:     user.Commands,
 			HideDotfiles: user.HideDotfiles,
+			DateFormat:   user.DateFormat,
 		},
 		StandardClaims: jwt.StandardClaims{
 			IssuedAt:  time.Now().Unix(),

http/static.go

@@ -29,6 +29,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys
 	data := map[string]interface{}{
 		"Name":            d.settings.Branding.Name,
 		"DisableExternal": d.settings.Branding.DisableExternal,
+		"Color":           d.settings.Branding.Color,
 		"BaseURL":         d.server.BaseURL,
 		"Version":         version.Version,
 		"StaticURL":       path.Join(d.server.BaseURL, "/static"),

settings/branding.go

@@ -6,4 +6,5 @@ type Branding struct {
 	DisableExternal bool   `json:"disableExternal"`
 	Files           string `json:"files"`
 	Theme           string `json:"theme"`
+	Color           string `json:"color"`
 }

settings/defaults.go

@@ -18,6 +18,7 @@ type UserDefaults struct {
 	Perm         users.Permissions `json:"perm"`
 	Commands     []string          `json:"commands"`
 	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
 }
 
 // Apply applies the default options to a user.
@@ -32,4 +33,5 @@ func (d *UserDefaults) Apply(u *users.User) {
 	u.Sorting = d.Sorting
 	u.Commands = d.Commands
 	u.HideDotfiles = d.HideDotfiles
+	u.DateFormat = d.DateFormat
 }

users/users.go

@@ -37,6 +37,7 @@ type User struct {
 	Fs           afero.Fs      `json:"-" yaml:"-"`
 	Rules        []rules.Rule  `json:"rules"`
 	HideDotfiles bool          `json:"hideDotfiles"`
+	DateFormat   bool          `json:"dateFormat"`
 }
 
 // GetRules implements rules.Provider.