Merge pull request #503 from bergware/master

Miscellaneous updates

.gitattributes

@@ -1,3 +1,17 @@
-text eol=lf
-*.woff binary
-*.woff2 binary
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -1,27 +1,47 @@
-# Numerous always-ignore extensions
-*.diff
-*.err
-*.orig
-*.log
-*.rej
-*.swo
-*.swp
-*.vi
-*~
-*.sass-cache
-
-# OS or Editor folders
-.DS_Store
+# Windows image file caches
 Thumbs.db
-.cache
-.project
-.settings
-.tmproj
-*.esproj
-nbproject
-*.sublime-project
-*.sublime-workspace
-sftp-settings.json
-sftp-config.json
-sftp-config-alt.json
-sftp-config-alt2.json
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

plugins/dynamix/AFP.page

@@ -4,8 +4,8 @@ Icon="icon-apple"
 Tag="apple"
 ---
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2019, Lime Technology
+ * Copyright 2012-2019, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,6 +15,8 @@ Tag="apple"
  * all copies or substantial portions of the Software.
  */
 ?>
+<div class='notice' style='margin-bottom:24px'>Please note that AFP is decrecated and users are encouraged to use SMB instead</div>
+
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame">
 Enable AFP:
 : <select name="shareAFPEnabled" size="1">

plugins/dynamix/DashStats.page

@@ -175,7 +175,7 @@ span.outer{float:left}
 span.inner{width:134px}
 span.ups{width:124px;display:inline-block}
 span.busy,i.inactive{opacity:0.5}
-span#inbound{width:70px;display:inline-block}
+span#inbound{width:75px;display:inline-block}
 span#load{width:80px;display:inline-block}
 span#util{margin-left:20px}
 span[id^=cpu],span[id^=sys]{width:0}