diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 8dd4342138..b0ee23761d 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -28,7 +28,6 @@ package hudson; import hudson.model.Slave; import hudson.security.*; import java.util.function.Predicate; -import jenkins.telemetry.impl.AutoRefresh; import jenkins.util.SystemProperties; import hudson.cli.CLICommand; import hudson.console.ConsoleAnnotationDescriptor; @@ -646,54 +645,17 @@ public class Functions { private static final SimpleFormatter formatter = new SimpleFormatter(); /** - * Used by {@code layout.jelly} to control the auto refresh behavior. + * No longer used. * - * @param noAutoRefresh - * On certain pages, like a page with forms, will have annoying interference - * with auto refresh. On those pages, disable auto-refresh. + * @deprecated auto refresh has been removed */ + @Deprecated public static void configureAutoRefresh(HttpServletRequest request, HttpServletResponse response, boolean noAutoRefresh) { - if(noAutoRefresh) - return; - - String param = request.getParameter("auto_refresh"); - boolean refresh = isAutoRefresh(request); - if (param != null) { - refresh = Boolean.parseBoolean(param); - Cookie c = new Cookie("hudson_auto_refresh", Boolean.toString(refresh)); - // Need to set path or it will not stick from e.g. a project page to the dashboard. - // Using request.getContextPath() might work but it seems simpler to just use the hudson_ prefix - // to avoid conflicts with any other web apps that might be on the same machine. - c.setPath("/"); - c.setMaxAge(60*60*24*30); // persist it roughly for a month - c.setHttpOnly(true); - response.addCookie(c); - } - if (refresh) { - response.addHeader("Refresh", SystemProperties.getString("hudson.Functions.autoRefreshSeconds", "10")); - } - - try { - ExtensionList.lookupSingleton(AutoRefresh.class).recordRequest(request, refresh); - } catch (Exception e) { - LOGGER.log(Level.WARNING, "Failed to record auto refresh status in telemetry", e); - } + /* feature has been removed */ } + @Deprecated public static boolean isAutoRefresh(HttpServletRequest request) { - String param = request.getParameter("auto_refresh"); - if (param != null) { - return Boolean.parseBoolean(param); - } - Cookie[] cookies = request.getCookies(); - if(cookies==null) - return false; // when API design messes it up, we all suffer - - for (Cookie c : cookies) { - if (c.getName().equals("hudson_auto_refresh")) { - return Boolean.parseBoolean(c.getValue()); - } - } return false; } diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 190eb985f9..e5aac0cd67 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -384,12 +384,15 @@ public abstract class View extends AbstractModelObject implements AccessControll } /** - * Enables or disables automatic refreshes of the view. - * By default, automatic refreshes are enabled. + * Used to enable or disable automatic refreshes of the view. + * * @since 1.557 + * + * @deprecated Auto-refresh has been removed */ + @Deprecated public boolean isAutomaticRefreshEnabled() { - return true; + return false; } /** diff --git a/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java b/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java deleted file mode 100644 index cbbe31e3d8..0000000000 --- a/core/src/main/java/jenkins/telemetry/impl/AutoRefresh.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2019, Daniel Beck - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package jenkins.telemetry.impl; - -import hudson.Extension; -import jenkins.telemetry.Telemetry; -import net.sf.json.JSONObject; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -import javax.annotation.Nonnull; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import java.time.LocalDate; -import java.util.HashSet; -import java.util.Set; - -@Extension -@Restricted(NoExternalUse.class) -public class AutoRefresh extends Telemetry { - - private static final Set sessionsWithAutoRefresh = new HashSet<>(); - private static final Set sessionsWithoutAutoRefresh = new HashSet<>(); - - @Nonnull - @Override - public String getDisplayName() { - return Messages.AutoRefresh_DisplayName(); - } - - @Nonnull - @Override - public LocalDate getStart() { - return LocalDate.of(2019, 10, 20); - } - - @Nonnull - @Override - public LocalDate getEnd() { - return LocalDate.of(2019, 12, 31); - } - - @Override - public JSONObject createContent() { - int sessionsWithAutoRefreshCount, sessionsWithoutAutoRefreshCount; - synchronized (sessionsWithAutoRefresh) { - sessionsWithAutoRefreshCount = sessionsWithAutoRefresh.size(); - sessionsWithAutoRefresh.clear(); - } - synchronized (sessionsWithoutAutoRefresh) { - sessionsWithoutAutoRefreshCount = sessionsWithoutAutoRefresh.size(); - sessionsWithoutAutoRefresh.clear(); - } - - if (sessionsWithAutoRefreshCount == 0 && sessionsWithoutAutoRefreshCount == 0) { - return null; - } - - JSONObject payload = new JSONObject(); - payload.put("enabled", sessionsWithAutoRefreshCount); - payload.put("disabled", sessionsWithoutAutoRefreshCount); - return payload; - } - - public void recordRequest(HttpServletRequest request, boolean enabled) { - if (Telemetry.isDisabled()) { - return; - } - if (!isActivePeriod()) { - return; - } - HttpSession session = request.getSession(false); - if (session != null) { - String sessionId = session.getId(); - if (enabled) { - synchronized (sessionsWithAutoRefresh) { - sessionsWithAutoRefresh.add(sessionId); - } - } else { - synchronized (sessionsWithoutAutoRefresh) { - sessionsWithoutAutoRefresh.add(sessionId); - } - } - } - } -} diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly index 51d7b09003..929bb4915c 100644 --- a/core/src/main/resources/hudson/AboutJenkins/index.jelly +++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly @@ -26,7 +26,7 @@ THE SOFTWARE. - +
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 280203d2e6..894b5ef990 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + diff --git a/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly b/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly index 901293af95..6569c1dc29 100644 --- a/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly +++ b/core/src/main/resources/hudson/PluginManager/checkUpdates.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 4660aa776e..26548da4e2 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly index 1d4423eb7d..a212ad3d52 100644 --- a/core/src/main/resources/hudson/PluginManager/table.jelly +++ b/core/src/main/resources/hudson/PluginManager/table.jelly @@ -31,7 +31,7 @@ THE SOFTWARE. --> - + diff --git a/core/src/main/resources/lib/hudson/editableDescription.jelly b/core/src/main/resources/lib/hudson/editableDescription.jelly index b47a03c9bd..585b844c2b 100644 --- a/core/src/main/resources/lib/hudson/editableDescription.jelly +++ b/core/src/main/resources/lib/hudson/editableDescription.jelly @@ -40,7 +40,7 @@ THE SOFTWARE. -
+
diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly index 663d7b64e2..4cd01bcadd 100644 --- a/core/src/main/resources/lib/hudson/executors.jelly +++ b/core/src/main/resources/lib/hudson/executors.jelly @@ -155,7 +155,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly index 914657dad6..770233322d 100644 --- a/core/src/main/resources/lib/hudson/queue.jelly +++ b/core/src/main/resources/lib/hudson/queue.jelly @@ -101,7 +101,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly index 494dc6c516..9cb0503151 100644 --- a/core/src/main/resources/lib/hudson/scriptConsole.jelly +++ b/core/src/main/resources/lib/hudson/scriptConsole.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly index 3412b1a87c..74a8b1755a 100644 --- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly +++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly @@ -66,19 +66,6 @@ THE SOFTWARE. - - - -
diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_ar.properties b/core/src/main/resources/lib/layout/breadcrumbBar_ar.properties deleted file mode 100644 index 0b2e50fa90..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_ar.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -ENABLE\ AUTO\ REFRESH=\u062A\u0645\u0643\u064A\u0646 \u0627\u0644\u062A\u062D\u062F\u064A\u062B \u0627\u0644\u062A\u0644\u0642\u0627\u0626\u064A diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_bg.properties b/core/src/main/resources/lib/layout/breadcrumbBar_bg.properties deleted file mode 100644 index 0196e2201b..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_bg.properties +++ /dev/null @@ -1,26 +0,0 @@ -# The MIT License -# -# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -DISABLE\ AUTO\ REFRESH=\ - \u0411\u0435\u0437 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u043f\u0440\u0435\u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 -ENABLE\ AUTO\ REFRESH=\ - \u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u043f\u0440\u0435\u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_ca.properties b/core/src/main/resources/lib/layout/breadcrumbBar_ca.properties deleted file mode 100644 index c352446bce..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_ca.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=DESHABILITAR REFRESC AUTOM\u00C0TIC -ENABLE\ AUTO\ REFRESH=HABILITAR REFRESC AUTOM\u00C0TIC diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_cs.properties b/core/src/main/resources/lib/layout/breadcrumbBar_cs.properties deleted file mode 100644 index 69854bf8cc..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_cs.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=Vypnout automatick\u00E9 obnovov\u00E1n\u00ED str\u00E1nky -ENABLE\ AUTO\ REFRESH=POVOLIT AUTO REFRESH diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_da.properties b/core/src/main/resources/lib/layout/breadcrumbBar_da.properties deleted file mode 100644 index 7ee5df8a97..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_da.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=Autoopdater ikke siden -ENABLE\ AUTO\ REFRESH=automatisk genopfriskning diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_de.properties b/core/src/main/resources/lib/layout/breadcrumbBar_de.properties deleted file mode 100644 index d497257401..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_de.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -DISABLE\ AUTO\ REFRESH=AUTO-AKTUALISIERUNG AUSSCHALTEN -ENABLE\ AUTO\ REFRESH=AUTO-AKTUALISIERUNG EINSCHALTEN diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_el.properties b/core/src/main/resources/lib/layout/breadcrumbBar_el.properties deleted file mode 100644 index 4c0bfff064..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_el.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=\u0386\u03C0\u03B5\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B7\u03C2 \u03B1\u03BD\u03B1\u03BD\u03AD\u03C9\u03C3\u03B7\u03C2 - -ENABLE\ AUTO\ REFRESH=\u0395\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B7\u03C2 \u03B1\u03BD\u03B1\u03BD\u03AD\u03C9\u03C3\u03B7\u03C2 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_es.properties b/core/src/main/resources/lib/layout/breadcrumbBar_es.properties deleted file mode 100644 index 8eb26d5e7a..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_es.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -DISABLE\ AUTO\ REFRESH=DESHABILITAR REFRESCO AUTOM\u00C1TICO - -ENABLE\ AUTO\ REFRESH=ACTIVAR AUTO REFRESCO diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_es_AR.properties b/core/src/main/resources/lib/layout/breadcrumbBar_es_AR.properties deleted file mode 100644 index 8688f104ea..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_es_AR.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -ENABLE\ AUTO\ REFRESH=Habilitar Auto Refresco diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_et.properties b/core/src/main/resources/lib/layout/breadcrumbBar_et.properties deleted file mode 100644 index 5306a3fb64..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_et.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -ENABLE\ AUTO\ REFRESH=LUBA AUTOMAATNE V\u00C4RSKENDAMINE -DISABLE\ AUTO\ REFRESH=KEELA AUTOMAATNE V\u00C4RSKENDAMINE diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_fi.properties b/core/src/main/resources/lib/layout/breadcrumbBar_fi.properties deleted file mode 100644 index 602136e5f8..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_fi.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=POISTA AUTOMAATTINEN P\u00C4IVITYS K\u00C4YT\u00D6ST\u00C4 -ENABLE\ AUTO\ REFRESH=Salli n\u00E4kym\u00E4n virkist\u00E4minen diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties b/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties deleted file mode 100644 index aa6da31c8a..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_fr.properties +++ /dev/null @@ -1,25 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -DISABLE\ AUTO\ REFRESH=D\u00E9sactiver le rafra\u00EEchissement automatique - -ENABLE\ AUTO\ REFRESH=Rafra\u00EEchissement automatique diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_he.properties b/core/src/main/resources/lib/layout/breadcrumbBar_he.properties deleted file mode 100644 index 37fb1041cd..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_he.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This file is under the MIT License by authors - -ENABLE\ AUTO\ REFRESH=\u05D0\u05E4\u05E9\u05E8 \u05E8\u05E2\u05E0\u05D5\u05DF \u05D0\u05D5\u05D8\u05D5\u05DE\u05D8\u05D9 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_hu.properties b/core/src/main/resources/lib/layout/breadcrumbBar_hu.properties deleted file mode 100644 index a377c71f13..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_hu.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=Automatikus oldalfriss\u00EDt\u00E9s letilt\u00E1sa -ENABLE\ AUTO\ REFRESH=AUTOMATIKUS FRISS\u00CDT\u00C9S ENGED\u00C9LYEZ\u00C9SE diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_it.properties b/core/src/main/resources/lib/layout/breadcrumbBar_it.properties deleted file mode 100644 index f8fe07c89a..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_it.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=DISABILITA AGGIORNAMENTO AUTOMATICO -ENABLE\ AUTO\ REFRESH=ABILITA AGGIORNAMENTO AUTOMATICO diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_ja.properties b/core/src/main/resources/lib/layout/breadcrumbBar_ja.properties deleted file mode 100644 index 3a49b6b244..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_ja.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2012, Seiji Sogabe -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ENABLE\ AUTO\ REFRESH=\u81EA\u52D5\u30EA\u30ED\u30FC\u30C9\u3092on -DISABLE\ AUTO\ REFRESH=\u81EA\u52D5\u30EA\u30ED\u30FC\u30C9\u3092off diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_ko.properties b/core/src/main/resources/lib/layout/breadcrumbBar_ko.properties deleted file mode 100644 index ff69aa319d..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_ko.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=\uC790\uB3D9 \uC7AC\uC2DC\uC791 \uBE44 \uD65C\uC131\uD654 -ENABLE\ AUTO\ REFRESH=\uC790\uB3D9\uC73C\uB85C \uC0C8\uB85C\uACE0\uCE68 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_lt.properties b/core/src/main/resources/lib/layout/breadcrumbBar_lt.properties deleted file mode 100644 index b326584542..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_lt.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is under the MIT License by authors - -# /jenkins-core/src/main/resources/lib/layout/breadcrumbBar_lt.properties - -DISABLE\ AUTO\ REFRESH=I\u0160JUNGTI automatin\u012F puslapio atnaujinim\u0105 -ENABLE\ AUTO\ REFRESH=\u012EJUNGTI automatin\u012F puslapio atnaujinim\u0105 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_lv.properties b/core/src/main/resources/lib/layout/breadcrumbBar_lv.properties deleted file mode 100644 index 18ee12ca92..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_lv.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=ATSP\u0112JOT AUTOM\u0100TISKO ATSVAIDZIN\u0100S\u0100NU -ENABLE\ AUTO\ REFRESH=Ieslegt automatisku atjauno\u0161anu diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_nb_NO.properties b/core/src/main/resources/lib/layout/breadcrumbBar_nb_NO.properties deleted file mode 100644 index 4f35e256a2..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_nb_NO.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=DEAKTIVER AUTOOPPDATERING -ENABLE\ AUTO\ REFRESH=Sl\u00E5 p\u00E5 auto oppdatering diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_nl.properties b/core/src/main/resources/lib/layout/breadcrumbBar_nl.properties deleted file mode 100644 index 752f5c0cfe..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_nl.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=ZET AUTOMATISCH VERNIEUWEN UIT - -ENABLE\ AUTO\ REFRESH=ZET AUTOMATISCH VERNIEUWEN AAN diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_pl.properties b/core/src/main/resources/lib/layout/breadcrumbBar_pl.properties deleted file mode 100644 index 1055d459e1..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_pl.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=WY\u0141\u0104CZ AUTO OD\u015AWIE\u017BANIE -ENABLE\ AUTO\ REFRESH=W\u0141\u0104CZ AUTOMATYCZNE OD\u015AWIE\u017BANIE diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_pt.properties b/core/src/main/resources/lib/layout/breadcrumbBar_pt.properties deleted file mode 100644 index e2df18bc05..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_pt.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ENABLE\ AUTO\ REFRESH=Ativar atualiza\u00E7\u00E3o autom\u00E1tica -DISABLE\ AUTO\ REFRESH=Desativar atualiza\u00E7\u00E3o autom\u00E1tica diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties b/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties deleted file mode 100644 index ad28910755..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_pt_BR.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors -# Translated by Fernando Boaglio - -DISABLE\ AUTO\ REFRESH=DESABILITAR ATUALIZA\u00c7\u00c3O AUTOM\u00c1TICA -ENABLE\ AUTO\ REFRESH=HABILITAR ATUALIZA\u00C7\u00C3O AUTOM\u00C1TICA diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_pt_PT.properties b/core/src/main/resources/lib/layout/breadcrumbBar_pt_PT.properties deleted file mode 100644 index cabe35349b..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_pt_PT.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=Desativar refrescamento autom\u00E1tico - -ENABLE\ AUTO\ REFRESH=ATIVAR AUTO-ATUALIZA\u00C7\u00C3O diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_ro.properties b/core/src/main/resources/lib/layout/breadcrumbBar_ro.properties deleted file mode 100644 index 7ae30945a0..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_ro.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=DEZACTIVEAZ\u0102 RE\u00CENC\u0102RCAREA AUTOMAT\u0102 -ENABLE\ AUTO\ REFRESH=ACTIVEAZA ACTUALIZAREA AUTOMATA diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_ru.properties b/core/src/main/resources/lib/layout/breadcrumbBar_ru.properties deleted file mode 100644 index f1946cea35..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_ru.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 - -ENABLE\ AUTO\ REFRESH=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 - diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_sk.properties b/core/src/main/resources/lib/layout/breadcrumbBar_sk.properties deleted file mode 100644 index 3b879203b7..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_sk.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=VYPN\u00DA\u0164 AUTOMATICK\u00C9 OBNOVENIE -ENABLE\ AUTO\ REFRESH=POVOLI\u0164 AUTOMATICK\u00DA OBNOVU diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_sl.properties b/core/src/main/resources/lib/layout/breadcrumbBar_sl.properties deleted file mode 100644 index 504e408780..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_sl.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=ONEMOGO\u010CI SAMODEJNO OSVE\u017DEVANJE -ENABLE\ AUTO\ REFRESH=Onemogo\u010Di avtomatsko osve\u017Eevanje diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_sr.properties b/core/src/main/resources/lib/layout/breadcrumbBar_sr.properties deleted file mode 100644 index 335d0c0346..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_sr.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -ENABLE\ AUTO\ REFRESH=\u0421\u0430 \u0430\u0443\u0442\u043E\u043C\u0430\u0442\u0441\u043A\u0438\u043C \u043E\u0441\u0432\u0435\u0436\u0438\u0432\u0430\u045A\u0435\u043C -DISABLE\ AUTO\ REFRESH=\u0411\u0435\u0437 \u0430\u0443\u0442\u043E\u043C\u0430\u0442\u0441\u043A\u043E\u0433 \u043E\u0441\u0432\u0435\u0436\u0438\u0432\u0430\u045A\u0435\u043C diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_sv_SE.properties b/core/src/main/resources/lib/layout/breadcrumbBar_sv_SE.properties deleted file mode 100644 index 51df0def9e..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_sv_SE.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=Autouppdatera ej sidan -ENABLE\ AUTO\ REFRESH=AKTIVERA AUTOUPPDATERING diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_tr.properties b/core/src/main/resources/lib/layout/breadcrumbBar_tr.properties deleted file mode 100644 index 06661c79f6..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_tr.properties +++ /dev/null @@ -1,4 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=Otomatik Yenilemeyi Kapat -ENABLE\ AUTO\ REFRESH=Otomatik Yenilemeyi A\u00E7 diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_uk.properties b/core/src/main/resources/lib/layout/breadcrumbBar_uk.properties deleted file mode 100644 index 4af7832cf6..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_uk.properties +++ /dev/null @@ -1,5 +0,0 @@ -# This file is under the MIT License by authors - -DISABLE\ AUTO\ REFRESH=\u0412\u0418\u041A\u041B\u042E\u0427\u0418\u0422\u0418 \u0410\u0412\u0422\u041E\u041E\u041D\u041E\u0412\u041B\u0415\u041D\u041D\u042F - -ENABLE\ AUTO\ REFRESH=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u0435 \u043E\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F diff --git a/core/src/main/resources/lib/layout/breadcrumbBar_zh_TW.properties b/core/src/main/resources/lib/layout/breadcrumbBar_zh_TW.properties deleted file mode 100644 index ae26bf7e39..0000000000 --- a/core/src/main/resources/lib/layout/breadcrumbBar_zh_TW.properties +++ /dev/null @@ -1,24 +0,0 @@ -# The MIT License -# -# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -ENABLE\ AUTO\ REFRESH=\u958B\u555F\u81EA\u52D5\u66F4\u65B0\u9801\u9762 -DISABLE\ AUTO\ REFRESH=\u53D6\u6D88\u81EA\u52D5\u66F4\u65B0\u9801\u9762 diff --git a/core/src/main/resources/lib/layout/breadcrumbs.css b/core/src/main/resources/lib/layout/breadcrumbs.css index 30b65c2c42..05b1798fcb 100644 --- a/core/src/main/resources/lib/layout/breadcrumbs.css +++ b/core/src/main/resources/lib/layout/breadcrumbs.css @@ -49,8 +49,7 @@ min-height: 2.5rem; } -#breadcrumbs LI A, -.breadcrumbs__auto-refresh { +#breadcrumbs LI A { display: inline-block; display: inline-flex; align-items: center; @@ -63,8 +62,7 @@ } -#breadcrumbs LI A, #breadcrumbs LI A:link, #breadcrumbs LI A:visited, -.breadcrumbs__auto-refresh:link, .breadcrumbs__auto-refresh:visited { +#breadcrumbs LI A, #breadcrumbs LI A:link, #breadcrumbs LI A:visited { /* is this still needed? */ max-width: 1330px; @@ -79,15 +77,14 @@ color: #4d545d; } -#breadcrumbs LI A:hover, #breadcrumbs LI A:focus, -.breadcrumbs__auto-refresh:hover, .breadcrumbs__auto-refresh:focus { +#breadcrumbs LI A:hover, #breadcrumbs LI A:focus { /* TODO: change hover state add it in the LI element so that it applies to the menuSeparator */ text-decoration: underline; outline-color: #3FB3F7; } -#breadcrumbs LI A:active, .breadcrumbs__auto-refresh:active { +#breadcrumbs LI A:active { background-color: #C8CEC2; } @@ -95,11 +92,6 @@ cursor: pointer; } -.breadcrumbs__auto-refresh { - text-transform: lowercase; - margin-left: 1.5rem; -} - #breadcrumbs LI.children, #breadcrumbs LI.separator {/* '>' separator between two items */ width: 1.25rem; height: 100%; diff --git a/core/src/main/resources/lib/layout/html.jelly b/core/src/main/resources/lib/layout/html.jelly index 5fa717b347..aa35bd5b69 100644 --- a/core/src/main/resources/lib/layout/html.jelly +++ b/core/src/main/resources/lib/layout/html.jelly @@ -37,8 +37,7 @@ THE SOFTWARE. Title of the HTML page. Rendered into <title> tag. - If non-null and not "false", auto refresh is disabled on this page. - This is necessary for pages that include forms. + Deprecated: Used to disable auto refresh for a page. The feature has been removed. specify path that starts from "/" for loading additional CSS stylesheet. @@ -69,7 +68,6 @@ THE SOFTWARE. --> - ${h.advertiseHeaders(response)} diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index c6ea3ff9ca..eecee6aa92 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -34,8 +34,7 @@ THE SOFTWARE. Title of the HTML page. Rendered into <title> tag. - If non-null and not "false", auto refresh is disabled on this page. - This is necessary for pages that include forms. + Deprecated: Used to disable auto refresh for a page. The feature has been removed. specify path that starts from "/" for loading additional CSS stylesheet. @@ -85,7 +84,6 @@ THE SOFTWARE. - ${h.advertiseHeaders(response)} diff --git a/test/src/test/resources/hudson/model/DescriptorVisibilityFilterTest/Jenkins40545/index.jelly b/test/src/test/resources/hudson/model/DescriptorVisibilityFilterTest/Jenkins40545/index.jelly index 7f6750f19a..12f0c74105 100644 --- a/test/src/test/resources/hudson/model/DescriptorVisibilityFilterTest/Jenkins40545/index.jelly +++ b/test/src/test/resources/hudson/model/DescriptorVisibilityFilterTest/Jenkins40545/index.jelly @@ -1,6 +1,6 @@ - + descriptors found: ${h.filterDescriptors(it, no_descriptors_here).size()}.