From e5827798a11a3f20691750f137f740726f201e45 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:30:49 +0200 Subject: [PATCH 1/7] Add cache buster to logo --- core/css/header.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/header.css b/core/css/header.css index 5a2b8009b1..efdd3be7ce 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -68,7 +68,7 @@ } #header .logo { - background-image: url('../img/logo-icon.svg'); + background-image: url('../img/logo-icon.svg?v=1'); background-repeat: no-repeat; background-size: 175px; background-position: center; @@ -80,7 +80,7 @@ #header .logo-icon { /* display logo so appname can be shown next to it */ display: inline-block; - background-image: url('../img/logo-icon.svg'); + background-image: url('../img/logo-icon.svg?v=1'); background-repeat: no-repeat; background-position: center center; width: 62px; From 3c7d2544b9c71891ed412b69e942f1cdfb9580e0 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:34:55 +0200 Subject: [PATCH 2/7] Add cache buster to left menu bar --- core/templates/layout.user.php | 4 ++-- lib/private/TemplateLayout.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2c0d3f0529..a5025d5bed 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -115,7 +115,7 @@ class="active"> - + @@ -133,7 +133,7 @@ class="active"> - + diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 9e3bbf8847..7e5c120717 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -153,6 +153,7 @@ class TemplateLayout extends \OC_Template { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); $this->assign('cssfiles', array()); $this->assign('printcssfiles', []); + $this->assign('versionHash', self::$versionHash); foreach($cssFiles as $info) { $web = $info[1]; $file = $info[2]; From fb183f81439639b6899200bf456060678fc26949 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:36:14 +0200 Subject: [PATCH 3/7] Add cachebuster to right navigation --- core/templates/layout.user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index a5025d5bed..17f895bc17 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -81,14 +81,14 @@
  • class="active"> - +
  • > - + t('Log out'));?>
    • From 16521bfd7be8213f818ee292f27bafbfb75efcc5 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:37:22 +0200 Subject: [PATCH 4/7] Add cachebuster to styles.css --- core/css/styles.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 7f4f7896c9..428688060b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -26,7 +26,7 @@ body { #body-login { text-align: center; background-color: #0082c9; - background-image: url('../img/background.jpg'); + background-image: url('../img/background.jpg?v=1'); background-position: 50% 50%; background-repeat: no-repeat; background-size: cover; @@ -98,7 +98,7 @@ a.two-factor-cancel { font-size: 1.2em; padding: 3px; padding-left: 25px; - background: transparent url('../img/actions/search-white.svg') no-repeat 6px center; + background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center; color: #fff; border: 0; border-radius: 3px; @@ -465,7 +465,7 @@ label.infield { position: absolute !important; height: 20px; width: 24px; - background-image: url('../img/actions/toggle.svg'); + background-image: url('../img/actions/toggle.svg?v=1'); background-repeat: no-repeat; background-position: center; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; @@ -757,15 +757,15 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin .exception{color:#000;} .exception textarea{width:95%;height:200px;background:#ffe;border:0;} -.ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); } -.ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); } +.ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg?v=1'); } +.ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg?v=1'); } .ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; } /* ---- DIALOGS ---- */ #oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; } #oc-dialog-filepicker-content .dirtree .home { - background-image:url('../img/places/home.svg'); + background-image:url('../img/places/home.svg?v=1'); background-repeat:no-repeat; background-position: left center; width: 30px; @@ -848,7 +848,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} } .popup.topright { top:7em; right:1em; } .popup.bottomleft { bottom:1em; left:33em; } -.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; } +.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg?v=1') no-repeat center; } .popup h2 { font-size:20px; } .arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; } .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); } @@ -860,7 +860,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} div.crumb { float: left; display: block; - background-image: url('../img/breadcrumb.svg'); + background-image: url('../img/breadcrumb.svg?v=1'); background-repeat: no-repeat; background-position: right center; height: 44px; From f42d3ac9ecda9bfd8f3d1dad8d125d3076454acb Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:38:14 +0200 Subject: [PATCH 5/7] Add cachebuster to apps.css --- core/css/apps.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/css/apps.css b/core/css/apps.css index 0ccdb8a039..24865cd6f6 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -92,7 +92,7 @@ width: 44px; margin: 0; padding: 0; - background: none; background-image: url('../img/actions/triangle-s.svg'); + background: none; background-image: url('../img/actions/triangle-s.svg?v=1'); background-size: 16px; background-repeat: no-repeat; background-position: center; border: none; border-radius: 0; @@ -256,7 +256,7 @@ background-color: transparent; background-repeat: no-repeat; background-position: center; - background-image: url('../img/actions/more.svg'); + background-image: url('../img/actions/more.svg?v=1'); } #app-navigation .app-navigation-entry-utils-menu-button:hover button, @@ -497,7 +497,7 @@ padding: 0; margin: 0; background-color: #fff; - background-image: url('../img/actions/settings.svg'); + background-image: url('../img/actions/settings.svg?v=1'); background-position: 14px center; background-repeat: no-repeat; box-shadow: none; From 1f5b2977227addfe4c589e04afe6016df229ee78 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:38:41 +0200 Subject: [PATCH 6/7] Add cachebuster to apps.css --- apps/files/css/files.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 004a0b9ff5..b1759abfb1 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -87,26 +87,26 @@ /* icons for sidebar */ .nav-icon-files { - background-image: url('../img/folder.svg'); + background-image: url('../img/folder.svg?v=1'); } .nav-icon-recent { - background-image: url('../img/recent.svg'); + background-image: url('../img/recent.svg?v=1'); } .nav-icon-favorites { - background-image: url('../img/star.svg'); + background-image: url('../img/star.svg?v=1'); } .nav-icon-sharingin, .nav-icon-sharingout { - background-image: url('../img/share.svg'); + background-image: url('../img/share.svg?v=1'); } .nav-icon-sharinglinks { - background-image: url('../img/public.svg'); + background-image: url('../img/public.svg?v=1'); } .nav-icon-extstoragemounts { - background-image: url('../img/external.svg'); + background-image: url('../img/external.svg?v=1'); } .nav-icon-trashbin { - background-image: url('../img/delete.svg'); + background-image: url('../img/delete.svg?v=1'); } #app-navigation .nav-files a.nav-icon-files { From 5581a602cc3eceeb2efd647a3772be0537e58f66 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 18 Aug 2016 12:44:33 +0200 Subject: [PATCH 7/7] Add cachebuster to app icons in the admin screen --- settings/js/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index ac259dd798..985b117fef 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -236,10 +236,10 @@ OC.Settings.Apps = OC.Settings.Apps || { var img = ''; if (appfromstore) { - img += ''; + img += ''; } else { img += ''; - img += ''; + img += ''; } return img; },