Merge pull request #326 (uniform external links)

adds more imagemagick

css/css.css

@@ -1,6 +1,7 @@
 html, body {
   line-height: 1.5;
-  font-size: 16px;
+  font-size: 18px;
+  font-family: sans-serif;
   color: #888888;
   background-color: #060606;
   margin: 0;
@@ -44,6 +45,9 @@ html, body {
     "content"
     "footer";
   }
+  code {
+    word-break: break-all;
+  }
 }
 
 @media only screen and (min-width: 1000px) {
@@ -85,9 +89,6 @@ a:visited {
   display: inline;
 }
 
-h1, h2, h3, h4, h5, h6 {
-  font-family: 'Montserrat', sans-serif;
-}
 
 h1 {
   letter-spacing: 0.1em;
@@ -108,8 +109,11 @@ h3 {
   font-size: 1.5em;
 }
 
+h4 {
+  font-size: 1.2em;
+}
+
 .intro-lead {
-  font-family: 'Montserrat', sans-serif;
   font-size: 1em;
 }
 
@@ -118,8 +122,8 @@ code {
   color: #c7254e;
   background-color: #f9f2f4;
   border-radius: 4px;
-  word-break: break-all;
   word-wrap: break-word;
+  max-width: 800px;
   white-space: normal;
   display: inline-block;
 }
@@ -150,8 +154,14 @@ img {
   text-align: center;
 }
 
+.sample-image-small {
+  margin: 0 auto;
+  margin-bottom: 18px;
+  max-width: 250px;
+  text-align: center;
+}
+
 div {
-  font-family: 'Merriweather', serif;
   color: white;
 }
 
@@ -163,7 +173,6 @@ div {
   color: white;
   background-color: #383838;
   padding: 14px;
-  font-family: "Montserrat";
   letter-spacing: 0.05em;
   border: 1px solid black;
   cursor: pointer;
@@ -240,17 +249,17 @@ nav .heading {
 
 .hiding {
   opacity: 0;
-	height: 0;
+  height: 0;
   overflow: hidden;
 }
 
 input {
-	position: absolute;
+  position: absolute;
-	left: -999em
+  left: -999em;
 }
 
 input[type=checkbox]:checked + div {
-	opacity: 1;
+  opacity: 1;
   height: auto;
   overflow: hidden;
   transition: opacity .5s linear, height .5s linear;

js/js.js

@@ -3,10 +3,11 @@ $(document).ready(function() {
   // open recipe window if a hash is found in URL
   if(window.location.hash) {
     id = window.location.hash
+    console.log(id.substring(1))
     document.getElementById(id.substring(1)).checked = true;
     $('html, body').animate({ scrollTop: $(id).offset().top}, 1000);
     $(id).closest('div').find('.link').empty();
-    $(id).closest('div').find('.link').append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
+    $(id).closest('div').find('.link').append("<small>Link to this command: <a href='https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"'>https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"</a></small>");
   }
 
   // add hash URL when recipe is opened
@@ -14,7 +15,13 @@ $(document).ready(function() {
     id = $(this).attr("for");
     window.location.hash = ('#' + id)
     $('#' + id).closest('div').find('.link').empty();
-    $('#' + id).closest('div').find('.link').append("<small>Link to this command: <a href="+window.location.href+">"+window.location.href+"</a></small>");
+    $('#' + id).closest('div').find('.link').append("<small>Link to this command: <a href='https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"'>https://amiaopensource.github.io/ffmprovisr/index.html"+window.location.hash+"</a></small>");
+  });
+
+  $('#open-all').on("click", function(){
+    $('input[type=checkbox]').each(function(){
+      this.checked = !this.checked;
+    })
   });
 
 });

readme.md

@@ -44,15 +44,18 @@ You can read our contributor code of conduct [here](https://github.com/amiaopens
 
 ## Maintainers
 
-[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol) and [Reto Kromer](https://github.com/retokromer)
+[Ashley Blewer](https://github.com/ablwr), [Katherine Frances Nagels](https://github.com/kfrn), [Kieran O'Leary](https://github.com/kieranjol), [Reto Kromer](https://github.com/retokromer) and [Andrew Weaver](https://github.com/privatezero)
 
 ## Contributors
 * Gathered using [octohatrack](https://github.com/LABHR/octohatrack)
 
-*GitHub Contributors*:  
+*Code Contributors*:
 ablwr (Ashley)  
+bastibeckr (Basti Becker)  
+bturkus  
 dericed (Dave Rice)  
 edsu (Ed Summers)  
+jamessam (Jim Sam)  
 jfarbowitz (Jonathan Farbowitz)  
 kfrn (Katherine Frances Nagels)  
 kgrons (Kathryn Gronsbell)  
@@ -66,13 +69,19 @@ rfraimow
 *All Contributors*:
 ablwr (Ashley)  
 audiovisualopen  
+bastibeckr (Basti Becker)  
 brainwane (Sumana Harihareswara)  
 bturkus  
 dericed (Dave Rice)  
+drodz11 (Dave Rodriguez)  
 edsu (Ed Summers)  
+EG-tech (Ethan Gates)  
+federicomenaquintero (Federico Mena Quintero)  
 Fizz24  
+GregH18  
 jamessam (Jim Sam)  
 jfarbowitz (Jonathan Farbowitz)  
+JonnyTech  
 jronallo (Jason Ronallo)  
 kellyhaydon (metacynic)  
 kfrn (Katherine Frances Nagels)  
@@ -80,16 +89,19 @@ kgrons (Kathryn Gronsbell)
 kieranjol (Kieran O'Leary)  
 llogan (Lou)  
 mulvya  
+nkrabben (Nick Krabbenhoeft)  
 pjotrek-b (Peter B.)  
 privatezero (Andrew Weaver)  
 retokromer (Reto Kromer)  
 rfraimow  
 richardpl (Paul B Mahol)  
+ross-spencer (Ross Spencer)  
 todrobbins (Tod Robbins)  
 
 Repo: amiaopensource/ffmprovisr  
-GitHub Contributors: 12  
+Code Contributors: 15  
-All Contributors: 22  
+All Contributors: 30   
+Last updated: 2018-04-22 (4:2:2 Day)  
 
 ## AVHack Team
 
@@ -99,9 +111,12 @@ All Contributors: 22
 
 ## Sister projects
 
+[The Cable Bible](https://amiaopensource.github.io/cable-bible/): A Guide to Cables and Connectors Used for Audiovisual Tech  
 [Script Ahoy](http://dd388.github.io/crals/): Community Resource for Archivists and Librarians Scripting  
 [sourcecaster](https://datapraxis.github.io/sourcecaster/): helps you use the command line to work through common challenges that come up when working with digital primary sources.
 
 ## License
 
-<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://amiaopensource.github.io/ffmprovisr/" property="cc:attributionName" rel="cc:attributionURL">ffmprovisr</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/amiaopensource/ffmprovisr" rel="dct:source">https://github.com/amiaopensource/ffmprovisr</a>.
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png"></a><br>
+This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://amiaopensource.github.io/ffmprovisr/" property="cc:attributionName" rel="cc:attributionURL">ffmprovisr</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.<br>
+Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/amiaopensource/ffmprovisr" rel="dct:source">https://github.com/amiaopensource/ffmprovisr</a>.

scripts/check_audio_framemd5.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
   SCRIPT=$(basename "${0}")
- VERSION='2017-07-08'
+ VERSION="2018-02-10"
-  AUTHOR='ffmprovisr'
+  AUTHOR="ffmprovisr"
-     RED='\033[1;31m'
+     RED="\033[1;31m"
-    BLUE='\033[1;34m'
+    BLUE="\033[1;34m"
-      NC='\033[0m'
+      NC="\033[0m"
 
-if [[ "${OSTYPE}" = "cygwin" ]] || [ ! $(which diff) ]; then
+if [[ "${OSTYPE}" = "cygwin" ]] || [[ ! "$(which diff)" ]]; then
     echo -e "${RED}Error: 'diff' is not installed by default. Please install 'diffutils' from Cygwin.${NC}"
     exit 1
 fi
@@ -67,9 +67,8 @@ old_file=$(grep -v '^#' "${input_hash}")
 tmp_file=$(grep -v '^#' "${md5_tmp}")
 if [[ "${old_file}" = "${tmp_file}" ]]; then
     echo -e "${BLUE}'$(basename "${input_file}")' matches '$(basename "${input_hash}")'${NC}"
-    rm "${md5_tmp}"
 else
     echo -e "${RED}The following differences were detected between '$(basename "${input_file}")' and '$(basename "${input_hash}")':${NC}"
     diff "${input_hash}" "${md5_tmp}"
-    rm "${md5_tmp}"
 fi
+rm "${md5_tmp}"

scripts/check_video_framemd5.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
   SCRIPT=$(basename "${0}")
- VERSION='2017-07-08'
+ VERSION="2018-02-10"
-  AUTHOR='ffmprovisr'
+  AUTHOR="ffmprovisr"
-     RED='\033[1;31m'
+     RED="\033[1;31m"
-    BLUE='\033[1;34m'
+    BLUE="\033[1;34m"
-      NC='\033[0m'
+      NC="\033[0m"
 
-if [[ "${OSTYPE}" = "cygwin" ]] || [ ! $(which diff) ]; then
+if [[ "${OSTYPE}" = "cygwin" ]] || [[ ! "$(which diff)" ]]; then
     echo -e "${RED}Error: 'diff' is not installed by default. Please install 'diffutils' from Cygwin.${NC}"
     exit 1
 fi
@@ -64,9 +64,8 @@ old_file=$(grep -v '^#' "${input_hash}")
 tmp_file=$(grep -v '^#' "${md5_tmp}")
 if [[ "${old_file}" = "${tmp_file}" ]]; then
     echo -e "${BLUE}'$(basename "${input_file}")' matches '$(basename "${input_hash}")'${NC}"
-    rm "${md5_tmp}"
 else
     echo -e "${RED}The following differences were detected between '$(basename "${input_file}")' and '$(basename "${input_hash}")':${NC}"
     diff "${input_hash}" "${md5_tmp}"
-    rm "${md5_tmp}"
 fi
+rm "${md5_tmp}"

scripts/ffmprovisr

@@ -10,7 +10,7 @@ if [[ "$(uname -s)" = "Darwin" ]] ; then
     else
         ffmprovisr_path=$(find /usr/local/Cellar/ffmprovisr -iname 'index.html' | sort -M | tail -n1)
     fi
-    if [ -n "${default_browser}" ] ; then
+    if [[ -n "${default_browser}" ]] ; then
         open -b "${default_browser}" "${ffmprovisr_path}"
     else
         open "${ffmprovisr_path}"