From eeefbd841237c309302ff733e6937450c323972c Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Mon, 16 Jan 2017 15:12:39 +0100 Subject: [PATCH 1/3] Declare cramped_label_mode for make_proposal (FATE#322328) for Installation::ProposalClient#make_proposal FIXME: check also md files --- .../general/src/lib/installation/proposal_client.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/library/general/src/lib/installation/proposal_client.rb b/library/general/src/lib/installation/proposal_client.rb index ee26f044b..6c218afd7 100644 --- a/library/general/src/lib/installation/proposal_client.rb +++ b/library/general/src/lib/installation/proposal_client.rb @@ -116,6 +116,11 @@ def run # submodules that translate any strings internally based on internal maps # (e.g., keyboard etc.) need to take more action. # + # @option attrs [Boolean] "cramped_label_mode" + # Propose in a different format, + # pioneered in the CASP/CaaSP all-in-one dialog: we are short of space, + # and employ labels instead of RichText. + # # @return [Hash] containing: # # * **`"links"`** [Array] --- @@ -132,6 +137,11 @@ def run # The caller will format each item as a HTML list item (`
  • `). The # proposal can contain hyperlinks with IDs listed in the list `links`. # + # * **`"label_proposal"`** [Array, nil] + # (only used for `cramped_label_mode`) --- + # Human readable proposal. + # The caller will format each item as Label. + # # * **`"warning"`** [String, nil] --- # Warning in human readable format without HTML tags other than `\
    `. # The warning will be embedded in appropriate HTML format specifications From eacf5d87221b7ea5d385cb01bd52e4faf12a3b3a Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Tue, 17 Jan 2017 16:02:48 +0100 Subject: [PATCH 2/3] Tweaked markdown to not think there is a hyperlink --- library/general/src/lib/installation/proposal_client.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/general/src/lib/installation/proposal_client.rb b/library/general/src/lib/installation/proposal_client.rb index 6c218afd7..08538abd7 100644 --- a/library/general/src/lib/installation/proposal_client.rb +++ b/library/general/src/lib/installation/proposal_client.rb @@ -131,14 +131,14 @@ def run # Human readable proposal preformatted in HTML. It is possible to use # the {Yast::HTMLClass Yast::HTML} module for such formatting. # - # * **`"raw_proposal"`** [Array, nil] - # (only used if `preformatted_proposal` is not present) --- + # * **`"raw_proposal"`** [Array, nil] --- + # (only used if `preformatted_proposal` is not present) # Human readable proposal, not formatted yet. # The caller will format each item as a HTML list item (`
  • `). The # proposal can contain hyperlinks with IDs listed in the list `links`. # - # * **`"label_proposal"`** [Array, nil] - # (only used for `cramped_label_mode`) --- + # * **`"label_proposal"`** [Array, nil] --- + # (only used for `cramped_label_mode`) # Human readable proposal. # The caller will format each item as Label. # From e97976f8ba3d6d822991f3f3d35b001f8243239d Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Tue, 17 Jan 2017 16:25:24 +0100 Subject: [PATCH 3/3] Renamed to simple_mode thx lslezak --- library/general/src/lib/installation/proposal_client.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/general/src/lib/installation/proposal_client.rb b/library/general/src/lib/installation/proposal_client.rb index 08538abd7..7ecda0dd7 100644 --- a/library/general/src/lib/installation/proposal_client.rb +++ b/library/general/src/lib/installation/proposal_client.rb @@ -116,10 +116,11 @@ def run # submodules that translate any strings internally based on internal maps # (e.g., keyboard etc.) need to take more action. # - # @option attrs [Boolean] "cramped_label_mode" + # @option attrs [Boolean] "simple_mode" # Propose in a different format, # pioneered in the CASP/CaaSP all-in-one dialog: we are short of space, # and employ labels instead of RichText. + # The result must include `label_proposal`. # # @return [Hash] containing: # @@ -138,7 +139,7 @@ def run # proposal can contain hyperlinks with IDs listed in the list `links`. # # * **`"label_proposal"`** [Array, nil] --- - # (only used for `cramped_label_mode`) + # (only used for `simple_mode`) # Human readable proposal. # The caller will format each item as Label. #