diff mbox

[FFmpeg-devel] web/download: general improvements

Message ID 20191021215203.33391-1-lou@lrcd.com
State Accepted
Headers show

Commit Message

Lou Logan Oct. 21, 2019, 9:52 p.m. UTC
Mention big download button is for source code.
Mention "executable files" for Windows users in subheader.
State that FFmpeg only provides source code.
Rename OS X to macOS.
Remove PPA to EOL Ubuntu Trusty.
Add button to Old Releases.

Signed-off-by: Lou Logan <lou@lrcd.com>
---
 src/download | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Paul B Mahol Oct. 22, 2019, 6:05 p.m. UTC | #1
probably ok

On 10/21/19, Lou Logan <lou@lrcd.com> wrote:
> Mention big download button is for source code.
> Mention "executable files" for Windows users in subheader.
> State that FFmpeg only provides source code.
> Rename OS X to macOS.
> Remove PPA to EOL Ubuntu Trusty.
> Add button to Old Releases.
>
> Signed-off-by: Lou Logan <lou@lrcd.com>
> ---
>  src/download | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/src/download b/src/download
> index ce7e047..a8fdc26 100644
> --- a/src/download
> +++ b/src/download
> @@ -3,7 +3,7 @@
>    <div class="btn-download-wrapper">
>      <a href="https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.bz2" class="btn
> btn-success">
>        <i class="fa fa-cloud-download"></i>
> -      Download
> +      Download Source Code
>        <small>ffmpeg-4.2.1.tar.bz2</small>
>      </a>
>      <br>
> @@ -26,8 +26,8 @@
>        <div class="well" id="get-packages">
>          <h3>
>            <i class="fa fa-download"></i>
> -          Get the packages</h3>
> -
> +          Get packages &amp; executable files</h3>
> +        <p>FFmpeg only provides source code. Below are some links that
> provide it already compiled and ready to go.</p>
>          <div class="os-selector">
>            <div class="row">
>              <div class="col-xs-4">
> @@ -60,11 +60,7 @@
>                  <strong>Debian</strong> – deb-multimedia packages for
> Oldstable, Stable, Testing, Unstable
>                </a>
>                <a href="https://launchpad.net/ubuntu/+source/ffmpeg"
> class="list-group-item">
> -                <strong>Ubuntu</strong> – Official packages for Vivid,
> Wily, Xenial
> -              </a>
> -              <a
> href="https://launchpad.net/~mc3man/+archive/ubuntu/trusty-media"
> class="list-group-item">
> -                <strong>Ubuntu</strong> – Ubuntu Multimedia for Trusty PPA.
> Provides static binaries
> -                from most recent release branch.
> +                <strong>Ubuntu</strong> – Official packages
>                </a>
>                <a class="list-group-item" href="https://rpmfusion.org/">
>                  <strong>Fedora</strong> and <strong>Red Hat Enterprise
> Linux</strong> packages
> @@ -80,18 +76,18 @@
>            </div> <!-- build -->
>            <div id="build-windows" class="tab-pane active">
>
> -            <h3>Windows Packages</h3>
> +            <h3>Windows EXE Files</h3>
>
>              <div class="list-group">
>                <a class="list-group-item"
> href="https://ffmpeg.zeranoe.com/builds/">
> -                <strong>Windows</strong> Builds
> +                Windows builds by Zeranoe
>                </a>
>              </div> <!-- list-group -->
>
>            </div> <!-- build -->
>            <div id="build-mac" class="tab-pane active">
>
> -            <h3>OS X Packages</h3>
> +            <h3>macOS</h3>
>
>              <div class="list-group">
>                <a class="list-group-item"
> href="https://evermeet.cx/ffmpeg/">
> @@ -541,5 +537,9 @@ libpostproc    53.  3.100</pre>
>      Older versions are available at the <a href="olddownload.html">Old
>        Releases</a> page.
>    </p>
> -
> +  <div class="row">
> +    <div class="col-md-3">
> +      <a class="btn btn-success" href="olddownload.html">Get old
> releases</a>
> +    </div> <!-- col -->
> +  </div> <!-- row -->
>  </div> <!-- #download -->
> --
> 2.23.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Lou Logan Oct. 24, 2019, 7:34 p.m. UTC | #2
On Tue, Oct 22, 2019, at 10:05 AM, Paul B Mahol wrote:
> probably ok

Pushed b293ec7188b6b39ac769f358a2f4a95d0a49c1b7.

Now giant download button is more giant, but I will adjust the CSS.
Deby Page Oct. 25, 2019, 11:17 a.m. UTC | #3
On Thu, Oct 24, 2019 at 9:35 PM Lou Logan <lou@lrcd.com> wrote:
> On Tue, Oct 22, 2019, at 10:05 AM, Paul B Mahol wrote:
> > probably ok
>
> Pushed b293ec7188b6b39ac769f358a2f4a95d0a49c1b7.
>
> Now giant download button is more giant, but I will adjust the CSS.

I would recommend adding the following to the button's CSS, wrapping
the button to multiple lines on smaller screens:
white-space: normal;
Michael Niedermayer Oct. 25, 2019, 6:55 p.m. UTC | #4
On Fri, Oct 25, 2019 at 01:17:16PM +0200, Deby Page wrote:
> On Thu, Oct 24, 2019 at 9:35 PM Lou Logan <lou@lrcd.com> wrote:
> > On Tue, Oct 22, 2019, at 10:05 AM, Paul B Mahol wrote:
> > > probably ok
> >
> > Pushed b293ec7188b6b39ac769f358a2f4a95d0a49c1b7.
> >
> > Now giant download button is more giant, but I will adjust the CSS.
> 
> I would recommend adding the following to the button's CSS, wrapping
> the button to multiple lines on smaller screens:

> white-space: normal;

LGTM (based on the screenshoot)

thx

[...]
Lou Logan Oct. 25, 2019, 11:09 p.m. UTC | #5
On Fri, Oct 25, 2019, at 3:17 AM, Deby Page wrote:
>
> I would recommend adding the following to the button's CSS, wrapping
> the button to multiple lines on smaller screens:
> white-space: normal;

Thanks. Pushed, but with errors:

  remote: lessc --clean-css src/less/style.less >
  htdocs/css/style.min.css remote: Error: Cannot find module 'clean-css'
  ...
  remote: ok/Makefile:71: recipe for target 'htdocs/css/style.min.css'
  failed remote: make: *** [htdocs/css/style.min.css] Error 2

Temporarily screwed up the site CSS, but luckily there is a recent
backup. Changed permission of style.min.css so lessc won't overwrite it
again until we deal with this properly.

It is lessc from the node-less repo package and not from npm. I tried
installing node-clean-css in a VM, but that doesn't help (TypeError:
CleanCSS is not a constructor). It worked in the VM when I installed
npm and used it to install lessc and clean-css. But I didn't like the
large number of npm dependencies, and don't want to use some other
package management system I have no experience with.

So I got lazy and edited style.min.css directly like a luddite. It's in
.gitignore anyway.

All of this because I wanted to edit a button text.
diff mbox

Patch

diff --git a/src/download b/src/download
index ce7e047..a8fdc26 100644
--- a/src/download
+++ b/src/download
@@ -3,7 +3,7 @@ 
   <div class="btn-download-wrapper">
     <a href="https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.bz2" class="btn btn-success">
       <i class="fa fa-cloud-download"></i>
-      Download
+      Download Source Code
       <small>ffmpeg-4.2.1.tar.bz2</small>
     </a>
     <br>
@@ -26,8 +26,8 @@ 
       <div class="well" id="get-packages">
         <h3>
           <i class="fa fa-download"></i>
-          Get the packages</h3>
-
+          Get packages &amp; executable files</h3>
+        <p>FFmpeg only provides source code. Below are some links that provide it already compiled and ready to go.</p>
         <div class="os-selector">
           <div class="row">
             <div class="col-xs-4">
@@ -60,11 +60,7 @@ 
                 <strong>Debian</strong> – deb-multimedia packages for Oldstable, Stable, Testing, Unstable
               </a>
               <a href="https://launchpad.net/ubuntu/+source/ffmpeg" class="list-group-item">
-                <strong>Ubuntu</strong> – Official packages for Vivid, Wily, Xenial
-              </a>
-              <a href="https://launchpad.net/~mc3man/+archive/ubuntu/trusty-media" class="list-group-item">
-                <strong>Ubuntu</strong> – Ubuntu Multimedia for Trusty PPA. Provides static binaries
-                from most recent release branch.
+                <strong>Ubuntu</strong> – Official packages
               </a>
               <a class="list-group-item" href="https://rpmfusion.org/">
                 <strong>Fedora</strong> and <strong>Red Hat Enterprise Linux</strong> packages
@@ -80,18 +76,18 @@ 
           </div> <!-- build -->
           <div id="build-windows" class="tab-pane active">
 
-            <h3>Windows Packages</h3>
+            <h3>Windows EXE Files</h3>
 
             <div class="list-group">
               <a class="list-group-item" href="https://ffmpeg.zeranoe.com/builds/">
-                <strong>Windows</strong> Builds
+                Windows builds by Zeranoe
               </a>
             </div> <!-- list-group -->
 
           </div> <!-- build -->
           <div id="build-mac" class="tab-pane active">
 
-            <h3>OS X Packages</h3>
+            <h3>macOS</h3>
 
             <div class="list-group">
               <a class="list-group-item" href="https://evermeet.cx/ffmpeg/">
@@ -541,5 +537,9 @@  libpostproc    53.  3.100</pre>
     Older versions are available at the <a href="olddownload.html">Old
       Releases</a> page.
   </p>
-
+  <div class="row">
+    <div class="col-md-3">
+      <a class="btn btn-success" href="olddownload.html">Get old releases</a>
+    </div> <!-- col -->
+  </div> <!-- row -->
 </div> <!-- #download -->