Commit 0b37b3e9 authored by henry's avatar henry Committed by morgan
Browse files

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in... 

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

TB 45058: Copy code from content/connectionPane.js to
widgets/tor-bridges-display.mjs.

Copy markup within connectionPane.inc.xhtml.
parent 7a41b6fc

browser/components/torpreferences/content/connectionPane.inc.xhtml

+274 −0
Original line number Diff line number Diff line 
  <html:div id="tor-bridges-none" hidden="hidden">

    <html:img id="tor-bridges-none-icon" alt="" />

    <html:div data-l10n-id="tor-bridges-none-added"></html:div>

  </html:div>

  <html:div id="tor-bridges-current" class="tor-bridges-box" hidden="hidden">

    <html:div id="tor-bridges-current-header-bar">

      <html:h2

        id="tor-bridges-current-heading-non-search"

        class="tor-bridges-current-heading tor-focusable-heading tor-small-heading tor-non-search-heading"

        tabindex="-1"

        data-l10n-id="tor-bridges-your-bridges"

      ></html:h2>

      <!-- Add a duplicate search heading.

         - In a search result the heading h1.tor-bridges-subcategory-heading

         - will be hidden, and the h2.tor-bridges-subcategory-heading

         - will be visible.

         - As such, all headings below h2.tor-bridges-subcategory-heading also

         - need to shift one lower in heading level to preseve the correct

         - hierarchy of - heading levels.

         - In this case we hide the <h2> heading and show the duplicate <h3>

         - heading instead.

         - See tor-browser#43320. -->

      <html:h3

        class="tor-bridges-current-heading tor-focusable-heading tor-small-heading tor-search-heading"

        tabindex="-1"

        data-l10n-id="tor-bridges-your-bridges"

      ></html:h3>

      <html:span

        id="tor-bridges-user-label"

        class="tor-bridges-source-label"

        data-l10n-id="tor-bridges-source-user"

      ></html:span>

      <html:span

        id="tor-bridges-built-in-label"

        class="tor-bridges-source-label"

        data-l10n-id="tor-bridges-source-built-in"

      ></html:span>

      <html:span

        id="tor-bridges-requested-label"

        class="tor-bridges-source-label"

        data-l10n-id="tor-bridges-source-requested"

      ></html:span>

      <html:span id="tor-bridges-lox-label" class="tor-bridges-source-label">

        <html:img id="tor-bridges-lox-label-icon" alt="" />

        <html:span data-l10n-id="tor-bridges-source-lox"></html:span>

      </html:span>

      <html:button

        id="tor-bridges-all-options-button"

        class="tor-bridges-options-button"

        aria-haspopup="menu"

        aria-expanded="false"

        aria-controls="tor-bridges-all-options-menu"

        data-l10n-id="tor-bridges-options-button"

      ></html:button>

      <html:panel-list

        id="tor-bridges-all-options-menu"

        data-hidden-from-search="true"

      >

        <html:panel-item

          id="tor-bridges-options-qr-all-menu-item"

          data-l10n-attrs="accesskey"

          data-l10n-id="tor-bridges-menu-item-qr-all-bridge-addresses"

        ></html:panel-item>

        <html:panel-item

          id="tor-bridges-options-copy-all-menu-item"

          data-l10n-attrs="accesskey"

          data-l10n-id="tor-bridges-menu-item-copy-all-bridge-addresses"

        ></html:panel-item>

        <html:panel-item

          id="tor-bridges-options-edit-all-menu-item"

          data-l10n-attrs="accesskey"

          data-l10n-id="tor-bridges-menu-item-edit-all-bridges"

        ></html:panel-item>

        <html:panel-item

          id="tor-bridges-options-remove-all-menu-item"

          data-l10n-attrs="accesskey"

          data-l10n-id="tor-bridges-menu-item-remove-all-bridges"

        ></html:panel-item>

      </html:panel-list>

    </html:div>

    <html:div id="tor-bridges-built-in-display" hidden="hidden">

      <html:div id="tor-bridges-built-in-type-name"></html:div>

      <html:div

        id="tor-bridges-built-in-connected"

        class="bridge-status-badge"

      >

        <html:div class="bridge-status-icon"></html:div>

        <html:span

          data-l10n-id="tor-bridges-built-in-status-connected"

        ></html:span>

      </html:div>

      <html:div id="tor-bridges-built-in-description"></html:div>

    </html:div>

    <html:div

      id="tor-bridges-grid-display"

      class="tor-bridges-grid"

      role="grid"

      aria-labelledby="tor-bridges-current-heading-non-search"

      hidden="hidden"

    ></html:div>

    <html:template id="tor-bridges-grid-row-template">

      <html:div class="tor-bridges-grid-row" role="row">

        <!-- TODO: lox status cell for new bridges? -->

        <html:span

          class="tor-bridges-type-cell tor-bridges-grid-cell"

          role="gridcell"

        ></html:span>

        <html:span class="tor-bridges-emojis-block" role="none"></html:span>

        <html:span class="tor-bridges-grid-end-block" role="none">

          <html:span

            class="tor-bridges-address-cell tor-bridges-grid-cell"

            role="gridcell"

          >

            <html:span class="tor-bridges-address-cell-text"></html:span>

          </html:span>

          <html:span

            class="tor-bridges-status-cell tor-bridges-grid-cell"

            role="gridcell"

          >

            <html:div class="bridge-status-badge">

              <html:div class="bridge-status-icon"></html:div>

              <html:span class="tor-bridges-status-cell-text"></html:span>

            </html:div>

          </html:span>

          <html:span

            class="tor-bridges-options-cell tor-bridges-grid-cell"

            role="gridcell"

          >

            <html:button

              class="tor-bridges-options-cell-button tor-bridges-options-button tor-bridges-grid-focus"

              aria-haspopup="menu"

              aria-expanded="false"

              data-l10n-id="tor-bridges-individual-bridge-options-button"

            ></html:button>

            <html:panel-list

              class="tor-bridges-individual-options-menu"

              data-hidden-from-search="true"

            >

              <html:panel-item

                class="tor-bridges-options-qr-one-menu-item"

                data-l10n-attrs="accesskey"

                data-l10n-id="tor-bridges-menu-item-qr-address"

              ></html:panel-item>

              <html:panel-item

                class="tor-bridges-options-copy-one-menu-item"

                data-l10n-attrs="accesskey"

                data-l10n-id="tor-bridges-menu-item-copy-address"

              ></html:panel-item>

              <html:panel-item

                class="tor-bridges-options-remove-one-menu-item"

                data-l10n-attrs="accesskey"

                data-l10n-id="tor-bridges-menu-item-remove-bridge"

              ></html:panel-item>

            </html:panel-list>

          </html:span>

        </html:span>

      </html:div>

    </html:template>

    <html:div

      id="tor-bridges-share"

      class="tor-bridges-details-box"

      hidden="hidden"

    >

      <html:h3

        class="tor-bridges-share-heading tor-small-heading tor-non-search-heading"

        data-l10n-id="tor-bridges-share-heading"

      ></html:h3>

      <!-- Add a duplicate search heading. See tor-browser#43320. -->

      <html:h4

        class="tor-bridges-share-heading tor-small-heading tor-search-heading"

        data-l10n-id="tor-bridges-share-heading"

      ></html:h4>

      <html:span

        id="tor-bridges-share-description"

        data-l10n-id="tor-bridges-share-description"

      ></html:span>

      <html:button

        id="tor-bridges-copy-addresses-button"

        data-l10n-id="tor-bridges-copy-addresses-button"

      ></html:button>

      <html:button

        id="tor-bridges-qr-addresses-button"

        data-l10n-id="tor-bridges-qr-addresses-button"

      ></html:button>

    </html:div>

    <html:div id="tor-bridges-lox-status" hidden="hidden">

      <html:div data-l10n-id="tor-bridges-lox-description"></html:div>

      <html:div

        id="tor-bridges-lox-details"

        class="tor-bridges-details-box tor-bridges-lox-box"

        hidden="hidden"

      >

        <html:img alt="" class="tor-bridges-lox-image-inner" />

        <html:img alt="" class="tor-bridges-lox-image-outer" />

        <html:h3

          class="tor-bridges-lox-next-unlock-counter tor-small-heading tor-bridges-lox-intro tor-focusable-heading tor-non-search-heading"

          tabindex="-1"

        ></html:h3>

        <!-- Add a duplicate search heading. See tor-browser#43320. -->

        <html:h4

          class="tor-bridges-lox-next-unlock-counter tor-small-heading tor-bridges-lox-intro tor-focusable-heading tor-search-heading"

          tabindex="-1"

        ></html:h4>

        <html:ul class="tor-bridges-lox-list">

          <html:li

            id="tor-bridges-lox-next-unlock-gain-bridges"

            class="tor-bridges-lox-list-item tor-bridges-lox-list-item-bridge"

            data-l10n-id="tor-bridges-lox-unlock-two-bridges"

            hidden="hidden"

          ></html:li>

          <html:li

            id="tor-bridges-lox-next-unlock-first-invites"

            class="tor-bridges-lox-list-item tor-bridges-lox-list-item-invite"

            data-l10n-id="tor-bridges-lox-unlock-first-invites"

            hidden="hidden"

          ></html:li>

          <html:li

            id="tor-bridges-lox-next-unlock-more-invites"

            class="tor-bridges-lox-list-item tor-bridges-lox-list-item-invite"

            data-l10n-id="tor-bridges-lox-unlock-more-invites"

            hidden="hidden"

          ></html:li>

        </html:ul>

        <html:div

          id="tor-bridges-lox-remaining-invites"

          hidden="hidden"

        ></html:div>

        <html:button

          id="tor-bridges-lox-show-invites-button"

          class="tor-bridges-lox-button"

          data-l10n-id="tor-bridges-lox-show-invites-button"

          hidden="hidden"

        ></html:button>

      </html:div>

      <html:div

        id="tor-bridges-lox-unlock-alert"

        role="alert"

        class="tor-bridges-details-box tor-bridges-lox-box"

        hidden="hidden"

      >

        <html:img alt="" class="tor-bridges-lox-image-inner" />

        <html:img alt="" class="tor-bridges-lox-image-outer" />

        <html:div

          id="tor-bridge-unlock-alert-title"

          class="tor-small-heading tor-bridges-lox-intro"

        ></html:div>

        <html:ul class="tor-bridges-lox-list">

          <html:li

            id="tor-bridges-lox-unlock-alert-gain-bridges"

            class="tor-bridges-lox-list-item tor-bridges-lox-list-item-bridge"

            data-l10n-id="tor-bridges-lox-gained-two-bridges"

            hidden="hidden"

          ></html:li>

          <html:li

            id="tor-bridges-lox-unlock-alert-new-bridges"

            class="tor-bridges-lox-list-item tor-bridges-lox-list-item-bridge"

            data-l10n-id="tor-bridges-lox-new-bridges"

            hidden="hidden"

          ></html:li>

          <html:li

            id="tor-bridges-lox-unlock-alert-invites"

            class="tor-bridges-lox-list-item tor-bridges-lox-list-item-invite"

            hidden="hidden"

          ></html:li>

        </html:ul>

        <html:button

          id="tor-bridges-lox-unlock-alert-button"

          class="tor-bridges-lox-button"

          data-l10n-id="tor-bridges-lox-got-it-button"

        ></html:button>

      </html:div>

    </html:div>

  </html:div>



<!-- Tor panel -->



<script

browser/components/torpreferences/widgets/tor-bridges-display.mjs

0 → 100644
+2159 −0

File added.

Preview size limit exceeded, changes collapsed.