GNOME.org
 

[gnome-user-docs/wip/classic-mode: 1/2] Adapt content for classic mode

commit d0200379511dc225f37e5d3c5e5ffdb38f1323f0
Author: Petr Kovar <pkovar redhat com>
Date:   Tue Apr 9 18:06:00 2013 +0200

    Adapt content for classic mode
    
    Started by Matthias Clasen, stil work in progress.
    
    This commit adjusts the text in a few places, using a new conditional
    test token, platform:gnome-classic.
    https://bugzilla.gnome.org/show_bug.cgi?id=697155

 gnome-help/C/clock-calendar.page          |   12 ++++-
 gnome-help/C/shell-apps-favorites.page    |    5 ++
 gnome-help/C/shell-apps-open.page         |    6 ++
 gnome-help/C/shell-exit.page              |    3 +-
 gnome-help/C/shell-introduction.page      |   91 ++++++++++++++++++++++++++---
 gnome-help/C/shell-notifications.page     |    4 +
 gnome-help/C/shell-terminology.page       |   28 ++++++++-
 gnome-help/C/shell-windows-maximize.page  |    4 +
 gnome-help/C/shell-windows-switching.page |    5 +-
 gnome-help/C/status-icons.page            |   11 ++++
 10 files changed, 155 insertions(+), 14 deletions(-)
---
diff --git a/gnome-help/C/clock-calendar.page b/gnome-help/C/clock-calendar.page
index 7352962..a02f35d 100644
--- a/gnome-help/C/clock-calendar.page
+++ b/gnome-help/C/clock-calendar.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="task"
       id="clock-calendar">
 
@@ -33,7 +34,7 @@
   <p>To view your appointments:</p>
   <steps>
    <item>
-    <p>Click on the clock in the middle of the top bar.</p>
+    <p>Click on the clock on the top bar.</p>
    </item>
    <item>
     <p>Click the date for which you want to see your appointments on the
@@ -46,9 +47,18 @@
    </item>
   </steps>
 
+ <if:choose>
+ <if:when test="!platform:gnome-classic">
  <media type="image" src="figures/shell-appts.png" width="500" height="396">
   <p>Clock, calendar, and appointments</p>
  </media>
+ </if:when>
+ <if:when test="platform:gnome-classic">
+ <media type="image" src="figures/shell-appts-classic.png" width="373" height="250">
+  <p>Clock, calendar, and appointments</p>
+ </media>
+ </if:when>
+ </if:choose>
 
   <p>To quickly get to the full <app>Evolution</app> calendar, click on the
  clock and click <gui>Open Calendar</gui>.</p>
diff --git a/gnome-help/C/shell-apps-favorites.page b/gnome-help/C/shell-apps-favorites.page
index a1251fa..6d7df77 100644
--- a/gnome-help/C/shell-apps-favorites.page
+++ b/gnome-help/C/shell-apps-favorites.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-apps-favorites">
@@ -40,4 +41,8 @@
 <p>To remove an application icon from the dash, right click on the application
  icon and select <gui>Remove from Favorites</gui>.</p>
 
+<note style="tip" if:test="platform:gnome-classic"><p>Favorite applications also
+appear in the <gui>Favorites</gui> section of the main menu.</p>
+</note>
+
 </page>
diff --git a/gnome-help/C/shell-apps-open.page b/gnome-help/C/shell-apps-open.page
index 2a21176..598814f 100644
--- a/gnome-help/C/shell-apps-open.page
+++ b/gnome-help/C/shell-apps-open.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-apps-open">
@@ -31,6 +32,11 @@ to overview in list item below, not just workspace thumbnail.) Right-click
 icon to choose a window to focus or get new window. Mention middle-click?</p>
 </comment>
 
+  <p if:test="platform:gnome-classic">You can start applications from the
+  <gui>Applications</gui> menu at the top left of the screen, or you can use
+  the <gui>Activities Overview</gui> by pressing the
+  <link xref="keyboard-key-super">Super key</link>.</p>
+
   <p>Move your mouse pointer to the <gui>Activities</gui> corner at the top
   left of the screen to show the <gui>Activities Overview</gui>. This is where
   you can find all of your applications. You can also open the overview by
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index addbaa9..03af75a 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="task"
       id="shell-exit">
 
@@ -51,7 +52,7 @@
   <p>To <gui>Log Out</gui> or <gui>Switch User</gui>, click your name on the
  top bar and select the appropriate option.</p>
 
-<note>
+<note if:test="!platform:gnome-classic">
   <p>The <gui>Log Out</gui> and <gui>Switch User</gui> entries only appear in
   the menu if you have more than one user account on your system.</p>
 </note>
diff --git a/gnome-help/C/shell-introduction.page b/gnome-help/C/shell-introduction.page
index d95761a..49d166c 100644
--- a/gnome-help/C/shell-introduction.page
+++ b/gnome-help/C/shell-introduction.page
@@ -35,10 +35,20 @@
 stay out of your way, minimize distractions, and help you get things done.
 When you first log in, you will see an empty desktop and the top bar.</p>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-top-bar.png"
        width="500" height="40" if:test="!target:mobile">
   <p>GNOME shell top bar</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-top-bar-classic.png"
+       width="500" height="40" if:test="!target:mobile">
+  <p>GNOME shell top bar</p>
+</media>
+</if:when>
+</if:choose>
 
 <p>The top bar provides access to your windows and applications, your
 calendar and appointments, and <link xref="status-icons">system properties</link> like sound, networking,
@@ -51,18 +61,37 @@ computer.</p>
 <section id="activities">
 <title>Activities overview</title>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-activities.png"
        width="128" height="75" style="floatend floatright"
        if:test="!target:mobile">
   <p>Activities button</p>
 </media>
-
-<p>To access your windows and applications, click the <gui>Activities</gui>
-button, or just throw your mouse pointer to the top-left hot corner.
-You can also press the <link xref="keyboard-key-super">Super key</link> on
-your keyboard. You can see your windows and applications in the overview.
-You can also just start typing to search your applications, files, and
-folders.</p>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-activities-classic.png"
+       width="108" height="69" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>Activities button</p>
+</media>
+</if:when>
+</if:choose>
+
+<p if:test="!platform:gnome-classic">To access your windows and applications,
+click the <gui>Activities</gui> button, or just move your mouse pointer to
+the top-left hot corner. You can also press the
+<link xref="keyboard-key-super">Super key</link> on your keyboard. You can
+see your windows and applications in the overview. You can also just start
+typing to search your applications, files, and folders.</p>
+
+<p if:test="platform:gnome-classic">To access your windows and applications
+in the Activities Overview, click the <gui>Applications</gui> button and
+select the <gui>Activities Overview</gui> item, or just move your mouse
+pointer to the top-left hot corner. You can also press the
+<link xref="keyboard-key-super">Super key</link> on your keyboard to see
+your windows and applications in the Activities Overview. Just start typing
+to search your applications, files, and folders.</p>
 
 <media type="image" src="figures/shell-dash.png"
        width="49" height="300" style="floatstart floatleft"
@@ -100,13 +129,24 @@ when they're not running, so you can access them quickly.</p>
 
 <section id="clock">
 <title>Clock, calendar &amp; appointments</title>
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-appts.png"
        width="250" height="198" style="floatend floatright"
        if:test="!target:mobile">
   <p>Clock, calendar, and appointments</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-appts-classic.png"
+       width="373" height="250" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>Clock, calendar, and appointments</p>
+</media>
+</if:when>
+</if:choose>
 
-<p>Click the clock in the middle of the top bar to see the current date,
+<p>Click the clock on the top bar to see the current date,
 a month-by-month calendar, and a list of your upcoming appointments.
 You can also access the date and time settings and open your full
 <app>Evolution</app> calendar directly from the menu.</p>
@@ -120,11 +160,22 @@ You can also access the date and time settings and open your full
 <section id="yourname">
 <title>You and your computer</title>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/shell-exit.png"
        width="250" height="200" style="floatend floatright"
        if:test="!target:mobile">
   <p>User menu</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-exit-classic.png"
+       width="250" height="200" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>User menu</p>
+</media>
+</if:when>
+</if:choose>
 
 <p>Click your name in the top-right corner to manage your profile and
 your computer.</p>
@@ -199,4 +250,28 @@ and allows you to control media playback.</p>
 </list>
 </section>
 
+<section id="window-list">
+<title>Window List</title>
+
+<if:choose>
+<if:when test="!platform:gnome-classic">
+
+  <p>GNOME does not have a permanently visible window list, to let
+  you focus on the task at hand without distractions. See
+  <link xref="shell-windows-switching"/> for alternatives.</p>
+
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/shell-window-list-classic.png"
+       width="500" height="40" if:test="!target:mobile">
+  <p>Window List</p>
+</media>
+
+  <p>The window list at the bottom of the screen provides access to
+  all your open windows and applications and lets you quickly minimize
+  and restore them. Clicking on the blue icon shows the message tray.</p>
+</if:when>
+</if:choose>
+</section>
+
 </page>
diff --git a/gnome-help/C/shell-notifications.page b/gnome-help/C/shell-notifications.page
index d7061a1..2471761 100644
--- a/gnome-help/C/shell-notifications.page
+++ b/gnome-help/C/shell-notifications.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="ui"
       id="shell-notifications">
 
@@ -58,6 +59,9 @@
   message tray contains all the notifications that you have not acted upon or
   that permanently reside in it.</p>
 
+  <p if:test="platform:gnome-classic">You can also show the message tray by
+  clicking on the blue number icon at the right-hand side of the window list.</p>
+
   <p>You can view the notifications by clicking on the message tray items. These
  are usually messages sent by applications. However, chat notifications are
  given special treatment, and are represented by the individual contacts who sent
diff --git a/gnome-help/C/shell-terminology.page b/gnome-help/C/shell-terminology.page
index 5f1890f..62674a9 100644
--- a/gnome-help/C/shell-terminology.page
+++ b/gnome-help/C/shell-terminology.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="reference"
       id="shell-terminology">
 
@@ -28,8 +29,12 @@
 <terms>
  <item>
   <title>Activities overview</title>
-  <p>The <em>activities overview</em> is the screen that's displayed when you
- click on <gui>Activities</gui> at the top left of the screen.</p>
+  <p if:test="!platform:gnome-classic">The <em>activities overview</em> is the
+  screen that is displayed when you click on <gui>Activities</gui> at the top
+  left of the screen.</p>
+  <p if:test="platform:gnome-classic">The <em>activities overview</em> is the
+  screen that is displayed when you select <gui>Activities Overview</gui> in
+  the <gui>Applications</gui> menu at the top left of the screen.</p>
  </item>
 
  <item>
@@ -61,6 +66,12 @@
  without having to unlock.</p>
  </item>
 
+ <item if:test="platform:gnome-classic">
+  <title>Main menu</title>
+  <p>The <em>main menu</em> is opened when you click on <gui>Applications</gui>
+  at the top left of the screen.</p>
+ </item>
+
  <item>
   <title>Notifications</title>
   <p><em>Notifications</em> are messages that pop up at the bottom of the
@@ -72,6 +83,13 @@
   see your messaging tray.</p>
  </item>
 
+ <item if:test="platform:gnome-classic">
+  <title>Places menu</title>
+  <p>The <em>places menu</em> is opened when you click on <gui>Places</gui>
+  on the <gui>top bar</gui>. It gives you quick access to important folders,
+  for example <gui>Downloads</gui> or <gui>Pictures</gui>.</p>
+ </item>
+
  <item>
   <title>Settings</title>
   <p>The <em>settings</em> are where you can change preferences and so on,
@@ -99,6 +117,12 @@
  the right-hand side of the <gui>Windows</gui> view in the activities overview.</p>
  </item>
 
+ <item if:test="platform:gnome-classic">
+  <title>Window list</title>
+  <p>The <em>window list</em> is the bar at the very bottom of the screen, which
+  shows buttons for all your open windows.</p>
+ </item>
+
 </terms>
 
 </page>
diff --git a/gnome-help/C/shell-windows-maximize.page b/gnome-help/C/shell-windows-maximize.page
index 0822fab..d6ba56c 100644
--- a/gnome-help/C/shell-windows-maximize.page
+++ b/gnome-help/C/shell-windows-maximize.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-windows-maximize">
@@ -32,6 +33,9 @@
   keyboard, hold down the <link xref="keyboard-key-super">Super key</link> and
   press <key>&#8593;</key>, or press <keyseq><key>Alt</key><key>F10</key></keyseq>.</p>
 
+  <p if:test="platform:gnome-classic">You can also maximize a window by
+  clicking on the maximize button in the titlebar.</p>
+
   <p>To restore a window to its unmaximized size, drag it away from the edges
   of the screen. If the window is fully maximized, you can double-click the
   titlebar to restore it. You can also use the same keyboard shortcuts you
diff --git a/gnome-help/C/shell-windows-switching.page b/gnome-help/C/shell-windows-switching.page
index 67a6ac7..2459a12 100644
--- a/gnome-help/C/shell-windows-switching.page
+++ b/gnome-help/C/shell-windows-switching.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic"
       style="task"
       id="shell-windows-switching">
@@ -42,14 +43,14 @@
   backwards.</p></item>
 </list>
 
-<note style="tip">
+<note style="tip" if:test="!platform:gnome-classic">
   <p>Windows in the window switcher are grouped by application. Previews of
   applications with multiple windows pop down as you click through. Hold down
   <key xref="keyboard-key-super">Super</key> and press <key>`</key> (or the key
   above <key>Tab</key>) to step through the list.</p>
 </note>
 
-<note>
+<note if:test="!platform:gnome-classic">
   <p>In the window switcher, applications from different workspaces are divided
   by vertical separators.</p>
 </note>
diff --git a/gnome-help/C/status-icons.page b/gnome-help/C/status-icons.page
index 7b8ee87..cdc47b8 100644
--- a/gnome-help/C/status-icons.page
+++ b/gnome-help/C/status-icons.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:if="http://projectmallard.org/if/1.0/";
       type="topic" style="ui"
       id="status-icons">
   <info>
@@ -20,10 +21,20 @@
   <title>What do the icons in the top bar mean?</title>
 <p>This section explains the meaning of icons located on the top right corner of the screen. More 
specifically, the different variations of the icons provided by the GNOME interface are described.</p>
 
+<if:choose>
+<if:when test="!platform:gnome-classic">
 <media type="image" src="figures/top-bar-icons.png"
        width="395" height="70" style="floatend">
   <p>GNOME Shell top bar</p>
 </media>
+</if:when>
+<if:when test="platform:gnome-classic">
+<media type="image" src="figures/top-bar-icons-classic.png"
+       width="395" height="70" style="floatend">
+  <p>GNOME Shell top bar</p>
+</media>
+</if:when>
+</if:choose>
 
 <links type="section"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]