diff --git a/res/include/img/background_patterns/developers.png b/res/include/img/background_patterns/developers.png new file mode 100644 index 0000000..0b588c4 Binary files /dev/null and b/res/include/img/background_patterns/developers.png differ diff --git a/res/include/md/hosting.md b/res/include/md/hosting.md index f0f0ae3..5362ed4 100644 --- a/res/include/md/hosting.md +++ b/res/include/md/hosting.md @@ -19,9 +19,9 @@ Keep in mind that these are maximums, you are allowed to go lower. |--------------------------|--------------|-------------| | Storage price per month | € 1.50 / TB | {{ div 1.50 $price | formatSC }} / TB | | Download price | € 1.00 / TB | {{ div 1 $price | formatSC }} / TB | -| Upload price | € 0.50 / TB | {{ div 0.50 $price | formatSC }} / TB | +| Upload price | € 0.50 / TB | {{ div 1 $price | formatSC }} / TB | | Collateral per month | € 5.00 / TB | {{ div 5 $price | formatSC }} / TB | -| Contract formation price | € 0.01 | {{ div 0.01 $price | formatSC }} | +| Contract formation price | € 0.01 | {{ div 0.05 $price | formatSC }} | Based on exchange rates from Kraken. diff --git a/res/include/script/admin.js b/res/include/script/admin.js index af43b56..1ee1d1e 100644 --- a/res/include/script/admin.js +++ b/res/include/script/admin.js @@ -214,7 +214,7 @@ function getStats(order) { ${formatDataVolume(v.free_space, 3)} ${formatDataVolume(v.min_free_space, 3)}` - if (v.free_space < v.min_free_space/2) { + if (v.free_space < v.min_free_space/2 || !v.reachable) { row.classList.add("highlight_red") } else if (v.free_space < v.min_free_space) { row.classList.add("highlight_blue") diff --git a/res/static/img/developers.xcf b/res/static/img/developers.xcf new file mode 100644 index 0000000..e963c67 Binary files /dev/null and b/res/static/img/developers.xcf differ diff --git a/res/static/img/misc/banner_amarulasolutions.png b/res/static/img/misc/banner_amarulasolutions.png new file mode 100644 index 0000000..53ca182 Binary files /dev/null and b/res/static/img/misc/banner_amarulasolutions.png differ diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html index 958a811..751c5c5 100644 --- a/res/template/file_viewer.html +++ b/res/template/file_viewer.html @@ -150,6 +150,10 @@ + {{else if eq .Other.AdType 4}} + + + {{end}} {{end}} diff --git a/webcontroller/file_viewer.go b/webcontroller/file_viewer.go index bc046f8..17273f9 100644 --- a/webcontroller/file_viewer.go +++ b/webcontroller/file_viewer.go @@ -37,13 +37,14 @@ func adType() (i int) { // The return value corresponds to the type of ad shown: // 0: A-ads - // 1: Amarulasolutions + // 1: Amarula Electronics // 2: Patreon // 3: Soul Studio Yoga + // 4: Amarula Solutions switch i { case 0, 1, 2, 3, 4: // 5/8 of the traffic - return 3 + return 4 case 5, 6, 7: // 3/8 of traffic return 2 default: