Changeset 2996

Timestamp:

08/27/08 08:07:38 (3 months ago)

Author:

takayama

Message:

Implemented BugId:81079
* Added system e-mail address into the wizard's mail settings step

Files:

• trunk/lib/MT/App/Wizard.pm (modified) (2 diffs)
• trunk/tmpl/wizard/mt-config.tmpl (modified) (1 diff)
• trunk/tmpl/wizard/optional.tmpl (modified) (1 diff)

trunk/lib/MT/App/Wizard.pm

@@ -113 +113 @@
-                params  => [
-                    qw(mail_transfer sendmail_path smtp_server
- test_mail_address
+test_mail_address email_address_main
-                ]
-            },
@@ -787 +787 @@
-                    && ( $param{mail_transfer} eq 'sendmail' )
-                    && $param{sendmail_path};
+            $cfg->EmailAddressMain( $param{email_address_main} )
+                if $param{email_address_main};
-            my %head = (
-                id => 'wizard_test',

trunk/tmpl/wizard/mt-config.tmpl

@@ -39 +39 @@
-#======== MAIL =======================
-
-
+
+
-SMTPServer <mt:var name="smtp_server"><mt:else><mt:if name="sendmail_path">
-SendMailPath <mt:var name="sendmail_path"></mt:if></mt:if></mt:if><mt:if name="temp_dir">

trunk/tmpl/wizard/optional.tmpl

@@ -122 +122 @@
-</div>
-
+<!-- Email Address Main -->
+
+    <mtapp:setting
+        id="email_address_main"
+        label="<__trans phrase="From mail address">"
+        label_class="top-label">
+<input type="text" id="email_address_main" class="ti" name="email_address_main" value="<mt:if name="email_address_main"><mt:var name="email_address_main" escape="html"></mt:if>" /><br />
+    </mtapp:setting>
+
-<!-- Test Address -->
-