Changeset 1334:0f6f0e1b3515

Timestamp:

01/10/10 20:00:33 (2 years ago)

Author:

Georg Brandl <georg@…>

Branch:

default

Message:

Work on the web migration template: add more information before performing the upgrade, and style the output a bit differently.

Location:

zine

Files:

• templates/admin/perform_upgrade.html (modified) (5 diffs)
• upgrades/__init__.py (modified) (1 diff)
• upgrades/versions/001_split_tables.py (modified) (2 diffs)
• upgrades/webapp.py (modified) (1 diff)

zine/templates/admin/perform_upgrade.html

@@ -15 +15 @@
 
     div.msg {
-      width: 90%;
+      width: 40em;
       margin: 0 auto 0 auto;
       padding: 20px;
@@ -31 +31 @@
 
     h2 {
-      border-bottom: 1px solid #cfcfcf;
-      margin-left: 10px;
+      border-top: 5px solid #cfcfcf;
+      padding-top: 5px;
+      margin-left: -20px;
       margin-bottom: 0;
-      margin-right: 10px;
+      margin-right: -20px;
       text-align: center;
     }
 
     h3 {
-      font-weight: small;
-      border-bottom: 1px dashed #cfcfcf;
-      margin-left: 10px;
-      margin-bottom: 0;
-      margin-right: 150px;
+      font-weight: normal;
+      border-bottom: 1px solid #cfcfcf;
     }
 
@@ -54 +52 @@
     }
 
-    p {
-      margin: 0;
-      padding: 0;
-    }
-
     div.message {
       border: 1px solid #E8B5B5;
-      margin: 0 -10px 10px -10px;
-      padding: 8px 8px 8px 32px;
+      padding: 8px;
       -moz-border-radius: 3px;
       -webkit-border-radius: 3px;
@@ -73 +65 @@
       margin-top: 10px;
       margin-left: 10px;
-      margin-right: 150px;
-      padding-top: 0;
-      padding-bottom: 0;
+      margin-right: 10px;
       background-color: #F7FAFD;
       border-color: #B4D2E7;
     }
-    span.progress, dl dt {
+
+    .progress {
       font-size: 80%;
       font-family: 'Consolas', 'Bitstream Vera Sans Mono', 'Monaco', monospace;
+    }
+
+    p.finish {
+      border-top: 5px solid #cfcfcf;
+      padding-top: 5px;
+      margin-left: -20px;
+      margin-right: -20px;
+      text-align: center;
     }
 
@@ -92 +91 @@
       <h1>{{ _("Upgrade In Progress") }}</h1>
       <p>{% trans %}<b>Database upgrade in progress!</b>{% endtrans %}</p>
-    {% elif live_log is defined %}
+    {%- elif live_log is defined %}
       <h1>{{ _("Upgrading...") }}</h1>
-      <p>{% trans %}Upgrade in process.
+      <p>{% trans %}Upgrade in progress.
         <strong>Don't hit cancel!</strong>{% endtrans %}</p>
       {%- for event in live_log %}{{ event }}{%- endfor %}
-      <p>{% trans %}Database upgraded successfully.{% endtrans %}</p>
+      <p class="finish">{% trans %}Database upgrade finished.{% endtrans %}</p>
       <br/>
-      <div class="message">{% trans %}Zine is in maintenance mode.
+      <div class="message">{% trans %}Zine maintenance mode has been switched on.
           Please <a href="{{ blog_url }}">check your blog</a> to see if the
-          upgrade was perfect.
-          Don't forget to <a href="{{ maintenance_url }}">turn it off again</a>
-          once you finish.
+          blog works fine with the upgraded database.
+          Don't forget to <a href="{{ maintenance_url }}">turn maintenance mode
+          off again</a> once you finish.
       {% endtrans %}</div>
+      {# XXX offer advice in case the upgrade failed? #}
       {{ finish() }}
-    {% else %}
-      <h1>{{ _("Upgrade") }}</h1>
+    {%- else %}
+      <h1>{{ _("Upgrade required") }}</h1>
       <p>{% trans %}<b>Zine requires a database upgrade!</b>{% endtrans %}</p>
+      <p>{% trans %}A database upgrade can become necessary when a new version
+          of Zine or one of your plugins is installed.{% endtrans %}</p>
+      <p>{% trans %}When you click “Perform upgrade”, your database will be
+          brought in sync with the format the installed software expects.  While
+          this is designed not to corrupt your database, you can back it up
+          now before clicking “Perform upgrade”.{% endtrans %}</p>
       <br/>
       <form action="" method="POST">
-        <input type="submit" name="upgrade" value="Upgrade!">
+        <input type="submit" name="upgrade" value="{{ _("Perform upgrade") }}">
       </form>
     {%- endif %}

zine/upgrades/__init__.py

@@ -245 +245 @@
         version = self._migrate_version(schema, version, upgrade)
 
+        yield '<h2>Migrating %s</h2>\n' % repository.id
+
         changeset = schema.changeset(version)
         if not changeset:
-            yield '<p>Repository %s is already up to date.</p>\n' % repository.id
+            yield '<p>This repository is already up to date.</p>\n'
             return
 
-        yield '<h2>Migrating %s</h2>\n' % repository.id
         for ver, change in changeset:
             nextver = ver + changeset.step

zine/upgrades/versions/001_split_tables.py

@@ -285 +285 @@
     metadata2.bind = migrate_engine
 
-    yield '<div class="message info"><dl>'
-    yield '<dt>.</dt><dd> comment</dd>\n'
-    yield '<dt>+</dt><dd> comment with <tt>parent_id</tt></dd>\n'
-    yield '<dt>E</dt><dd> Error handling comment</dd>\n'
-    yield '</dl></div>\n'
+    yield '<div class="message info">'
+    yield '<span class="progress">.&nbsp;&nbsp;</span>comment<br/>\n'
+    yield '<span class="progress">+&nbsp;&nbsp;</span>comment with parent_id<br/>\n'
+    yield '<span class="progress">E&nbsp;&nbsp;</span>error handling comment<br/>\n'
+    yield '</div>\n'
 
     yield '<ul>'
@@ -432 +432 @@
     metadata2.bind = migrate_engine
 
-    yield '<div class="message info"><dl>'
-    yield '<dt>.</dt><dd> comment</dd>\n'
-    yield '<dt>+</dt><dd> comment with <tt>parent_id</tt></dd>\n'
-    yield '<dt>E</dt><dd> Error handling comment</dd>\n'
-    yield '</dl></div>\n'
+    yield '<div class="message info">'
+    yield '<span class="progress">.&nbsp;&nbsp;</span>comment<br/>\n'
+    yield '<span class="progress">+&nbsp;&nbsp;</span>comment with parent_id<br/>\n'
+    yield '<span class="progress">E&nbsp;&nbsp;</span>error handling comment<br/>\n'
+    yield '</div>\n'
 
     yield '<ul>'

zine/upgrades/webapp.py

@@ -119 +119 @@
             open(self.lockfile, 'w').write('locked on database upgrade\n')
             mdb = ManageDatabase(request.app)
-            db.session.close()  # Close open sessions
+            db.session.close()  # close open sessions
             def finish():
-                # this runs after the upgrade finishes
+                # this is run from the template after the upgrade finishes
                 remove(self.lockfile)
-                db.session.close()  # Close open sessions
-                self.wants_reload = True    # Force application reload
+                db.session.close()  # close open sessions
+                self.wants_reload = True    # force application reload
                 return ''   # just because I need to return something to jinja