Consistent terminology: "Clear" -> "Cancel"

[?]
Nov 2, 2015, 1:22 PM
YM6HYHOKPDIVGRDA6ILILRZMEBVUOOZVHHLTIRZCMXLDFD4DIFVQC

Dependencies

  • [2] IS7ICWFQ Restore link to clearvcscache
  • [3] UOINKJ2J Add an action to cancel all builds in a jobset eval
  • [4] S5GCSCNS Update bootstrap to 2.3.1
  • [5] 7ZQAHJQM Fix indentation
  • [6] PZL3SZM3 Give every page a consistent title
  • [7] OEPUOUNB Using twitter bootstrap for more consistent looks for Hydra
  • [8] BPXMGUMQ topbar: Include "Create project" in menu.
  • [9] 3PNG7NIB Remove trailing whitespace
  • [10] I4K2UPCW Tweaks
  • [11] JARRBLZD Bootstrapify the Hydra forms (except the project and jobset edit pages)
  • [*] QL55ECJ6 - adapted ui for hydra, more in line with nixos.org website

Change contents

  • edit in src/root/topbar.tt at line 98
    [4.15142]
    [4.449]
    [% INCLUDE menuItem
    uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current'))
    title = "Cancel queued non-current builds"
    confirmmsg = "Are you sure you want to cancel all non-current builds?"
    class = "" %]
  • edit in src/root/topbar.tt at line 109
    [4.547][4.15406:15491](),[4.37530][4.15406:15491](),[4.15406][4.15406:15491](),[4.15491][3.1757:1821](),[4.610][4.17123:17188](),[3.1821][4.17123:17188](),[4.5553][4.17123:17188](),[4.15556][4.17123:17188](),[4.17188][4.2570:2592](),[4.2592][2.0:26]()
    uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current'))
    title = "Clear scheduled non-current builds from queue"
    confirmmsg = "Are you sure you want to clear the queue?"
    class = "" %]
    [% INCLUDE menuItem