[BUGFIX] Stylesheet for confirmation view missing in form sysext
authorOliver Hader <oliver@typo3.org>
Wed, 19 Oct 2011 19:41:23 +0000 (21:41 +0200)
committerOliver Hader <oliver@typo3.org>
Sun, 23 Oct 2011 17:46:03 +0000 (19:46 +0200)
The confirmation message does not have any CSS at the moment.

Change-Id: Ic2e182cda9f5333e0c6d7aad4d4bb9f929ca0568
Fixes: #13214
Reviewed-on: http://review.typo3.org/6071
Reviewed-by: Xavier Perseguers
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
typo3/sysext/form/Classes/View/Confirmation/Confirmation.php
typo3/sysext/form/Classes/View/Wizard/Wizard.php
typo3/sysext/form/Resources/Public/CSS/Confirmation.css [new file with mode: 0644]
typo3/sysext/form/Resources/Public/CSS/Form.css
typo3/sysext/form/Resources/Public/CSS/Wizard/Form.css [new file with mode: 0644]

index 84fd70d..cbc779d 100644 (file)
@@ -92,6 +92,7 @@ class tx_form_View_Confirmation extends tx_form_View_Confirmation_Element_Contai
         * @return string XHTML string containing the whole form
         */
        public function get() {
+               $this->setCss();
                $message = $this->getMessage();
 
                $node = $this->render('element', FALSE);
@@ -164,5 +165,18 @@ class tx_form_View_Confirmation extends tx_form_View_Confirmation_Element_Contai
 
                return $confirmationButtons;
        }
+
+       /**
+        * Add the form CSS file as additional header data
+        *
+        * @return void
+        */
+       protected function setCss() {
+               $GLOBALS['TSFE']->additionalHeaderData['tx_form_css'] =
+                       '<link rel="stylesheet" type="text/css" href="' .
+                       t3lib_extMgm::siteRelPath('form') .
+                       'Resources/Public/CSS/Confirmation.css' .
+                       '" media="all" />';
+       }
 }
 ?>
\ No newline at end of file
index 1642bc1..52cb256 100644 (file)
@@ -267,7 +267,7 @@ class tx_form_View_Wizard_Wizard extends tx_form_View_Wizard_Abstract {
                );
 
                $cssFiles = array(
-                       'Form.css',
+                       'Wizard/Form.css',
                        'Wizard/Wizard.css',
                );
 
diff --git a/typo3/sysext/form/Resources/Public/CSS/Confirmation.css b/typo3/sysext/form/Resources/Public/CSS/Confirmation.css
new file mode 100644 (file)
index 0000000..ed24e0b
--- /dev/null
@@ -0,0 +1,204 @@
+@CHARSET "UTF-8";
+
+div.csc-mailform ol,
+div.csc-mailform ol li {
+       margin: 0;
+       padding: 0;
+}
+
+div.csc-mailform ol li {
+       overflow: hidden;
+}
+
+div.csc-mailform fieldset {
+       margin: 0;
+       padding: 0;
+       position: relative;
+}
+
+div.csc-mailform legend {
+       margin-left: 1em;
+       color: #000000;
+       font-weight: bold;
+}
+
+div.csc-mailform fieldset ol {
+       padding: 1em 1em 0 1em;
+}
+
+div.csc-mailform fieldset li {
+       padding: 0.5em;
+       margin-bottom: 0.5em;
+       list-style: none;
+}
+
+div.csc-mailform fieldset.submit {
+       border-style: none;
+}
+
+/**
+ * Normal label
+ * Left aligned, in front of input
+ */
+div.csc-mailform li label {
+       float: left;
+       width: 13em;
+       margin-right: 1em;
+       vertical-align: baseline;
+}
+
+div.csc-mailform li input + label,
+div.csc-mailform li textarea + label,
+div.csc-mailform li select + label {
+       float: none;
+       width: auto;
+       margin-right: 0;
+       margin-left: 1em;
+}
+
+div.csc-mailform li textarea + label {
+       vertical-align: top;
+}
+
+label em,
+legend em {
+       display: block;
+       color: #060;
+       font-size: 85%;
+       font-style: normal;
+       text-transform: uppercase;
+}
+
+legend em {
+       position: absolute;
+}
+
+label strong,
+legend strong {
+       display: block;
+       color: #C00;
+       font-size: 85%;
+       font-weight: normal;
+       text-transform: uppercase;
+}
+
+legend strong {
+       position: absolute;
+       top: 1.4em;
+}
+
+/**
+ * Labels alignment right
+ */
+.labels-alignment-right label,
+.labels-alignment-right .fieldset-subgroup legend,
+.labels-alignment-right.fieldset-subgroup legend {
+       text-align: right;
+}
+
+/**
+ * Horizontal fieldset
+ */
+fieldset.fieldset-horizontal {
+       border-width: 0;
+}
+
+fieldset.fieldset-horizontal ol {
+       padding: 0;
+}
+
+fieldset.fieldset-horizontal li {
+       float: left;
+       padding: 0;
+       margin-right: 1em;
+}
+
+fieldset.fieldset-horizontal.label-below label {
+       display: block;
+       margin-left: 0;
+       margin-top: 0.2em;
+       font-size: 90%;
+       color: #999999;
+       text-align: left;
+}
+
+fieldset.fieldset-horizontal label em {
+       display: inline;
+}
+
+/**
+ * Subgroup fieldset
+ */
+fieldset.fieldset-subgroup {
+       margin-bottom: -2em;
+       border-style: none;
+}
+
+fieldset.fieldset-subgroup legend {
+       margin-left: 0;
+       padding: 0;
+       font-weight: normal;
+       width: 13em;
+}
+
+fieldset.fieldset-subgroup ol {
+       position: relative;
+       top: -1.4em;
+       margin: 0 0 0 14em;
+       padding: 0;
+}
+
+fieldset.fieldset-subgroup li {
+       padding: 0;
+}
+
+fieldset.fieldset-subgroup input + label {
+       float: none;
+       width: auto;
+       display: inline;
+       margin: 0 0 0 1em;
+}
+
+/**
+ * Labels as block
+ * Labels displayed above or below the input fields
+ */
+.labels-block label {
+       display: block;
+       float: none;
+       margin: 0 0 0.5em;
+       width: auto;
+}
+
+.labels-block input + label,
+.labels-block textarea + label {
+       margin: 0.5em 0 0;
+}
+
+.labels-block fieldset.fieldset-subgroup,
+fieldset.labels-block.fieldset-subgroup {
+       margin-bottom: 0;
+}
+
+.labels-block .fieldset-subgroup legend,
+.labels-block.fieldset-subgroup legend {
+       width: auto;
+}
+
+.labels-block .fieldset-subgroup legend em,
+.labels-block.fieldset-subgroup legend em {
+       position: relative;
+}
+
+.labels-block .fieldset-subgroup legend strong,
+.labels-block.fieldset-subgroup legend strong {
+       position: relative;
+       top: 0;
+}
+
+.labels-block .fieldset-subgroup ol,
+.labels-block.fieldset-subgroup ol {
+       top: 0;
+       margin: 0;
+       padding: 0.5em 0 0;
+}
\ No newline at end of file
index f5ce38d..ed24e0b 100644 (file)
@@ -1,29 +1,38 @@
 @CHARSET "UTF-8";
 
-form fieldset {
+div.csc-mailform ol,
+div.csc-mailform ol li {
+       margin: 0;
+       padding: 0;
+}
+
+div.csc-mailform ol li {
+       overflow: hidden;
+}
+
+div.csc-mailform fieldset {
        margin: 0;
        padding: 0;
        position: relative;
 }
 
-form legend {
+div.csc-mailform legend {
        margin-left: 1em;
        color: #000000;
        font-weight: bold;
 }
 
-form fieldset ol {
+div.csc-mailform fieldset ol {
        padding: 1em 1em 0 1em;
-       list-style: none;
 }
 
-form li {
-       overflow: hidden;
+div.csc-mailform fieldset li {
        padding: 0.5em;
        margin-bottom: 0.5em;
+       list-style: none;
 }
 
-form fieldset.submit {
+div.csc-mailform fieldset.submit {
        border-style: none;
 }
 
@@ -31,23 +40,23 @@ form fieldset.submit {
  * Normal label
  * Left aligned, in front of input
  */
-form li label {
+div.csc-mailform li label {
        float: left;
        width: 13em;
        margin-right: 1em;
        vertical-align: baseline;
 }
 
-form li input + label,
-form li textarea + label,
-form li select + label {
+div.csc-mailform li input + label,
+div.csc-mailform li textarea + label,
+div.csc-mailform li select + label {
        float: none;
        width: auto;
        margin-right: 0;
        margin-left: 1em;
 }
 
-form li textarea + label {
+div.csc-mailform li textarea + label {
        vertical-align: top;
 }
 
diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/Form.css b/typo3/sysext/form/Resources/Public/CSS/Wizard/Form.css
new file mode 100644 (file)
index 0000000..f5ce38d
--- /dev/null
@@ -0,0 +1,195 @@
+@CHARSET "UTF-8";
+
+form fieldset {
+       margin: 0;
+       padding: 0;
+       position: relative;
+}
+
+form legend {
+       margin-left: 1em;
+       color: #000000;
+       font-weight: bold;
+}
+
+form fieldset ol {
+       padding: 1em 1em 0 1em;
+       list-style: none;
+}
+
+form li {
+       overflow: hidden;
+       padding: 0.5em;
+       margin-bottom: 0.5em;
+}
+
+form fieldset.submit {
+       border-style: none;
+}
+
+/**
+ * Normal label
+ * Left aligned, in front of input
+ */
+form li label {
+       float: left;
+       width: 13em;
+       margin-right: 1em;
+       vertical-align: baseline;
+}
+
+form li input + label,
+form li textarea + label,
+form li select + label {
+       float: none;
+       width: auto;
+       margin-right: 0;
+       margin-left: 1em;
+}
+
+form li textarea + label {
+       vertical-align: top;
+}
+
+label em,
+legend em {
+       display: block;
+       color: #060;
+       font-size: 85%;
+       font-style: normal;
+       text-transform: uppercase;
+}
+
+legend em {
+       position: absolute;
+}
+
+label strong,
+legend strong {
+       display: block;
+       color: #C00;
+       font-size: 85%;
+       font-weight: normal;
+       text-transform: uppercase;
+}
+
+legend strong {
+       position: absolute;
+       top: 1.4em;
+}
+
+/**
+ * Labels alignment right
+ */
+.labels-alignment-right label,
+.labels-alignment-right .fieldset-subgroup legend,
+.labels-alignment-right.fieldset-subgroup legend {
+       text-align: right;
+}
+
+/**
+ * Horizontal fieldset
+ */
+fieldset.fieldset-horizontal {
+       border-width: 0;
+}
+
+fieldset.fieldset-horizontal ol {
+       padding: 0;
+}
+
+fieldset.fieldset-horizontal li {
+       float: left;
+       padding: 0;
+       margin-right: 1em;
+}
+
+fieldset.fieldset-horizontal.label-below label {
+       display: block;
+       margin-left: 0;
+       margin-top: 0.2em;
+       font-size: 90%;
+       color: #999999;
+       text-align: left;
+}
+
+fieldset.fieldset-horizontal label em {
+       display: inline;
+}
+
+/**
+ * Subgroup fieldset
+ */
+fieldset.fieldset-subgroup {
+       margin-bottom: -2em;
+       border-style: none;
+}
+
+fieldset.fieldset-subgroup legend {
+       margin-left: 0;
+       padding: 0;
+       font-weight: normal;
+       width: 13em;
+}
+
+fieldset.fieldset-subgroup ol {
+       position: relative;
+       top: -1.4em;
+       margin: 0 0 0 14em;
+       padding: 0;
+}
+
+fieldset.fieldset-subgroup li {
+       padding: 0;
+}
+
+fieldset.fieldset-subgroup input + label {
+       float: none;
+       width: auto;
+       display: inline;
+       margin: 0 0 0 1em;
+}
+
+/**
+ * Labels as block
+ * Labels displayed above or below the input fields
+ */
+.labels-block label {
+       display: block;
+       float: none;
+       margin: 0 0 0.5em;
+       width: auto;
+}
+
+.labels-block input + label,
+.labels-block textarea + label {
+       margin: 0.5em 0 0;
+}
+
+.labels-block fieldset.fieldset-subgroup,
+fieldset.labels-block.fieldset-subgroup {
+       margin-bottom: 0;
+}
+
+.labels-block .fieldset-subgroup legend,
+.labels-block.fieldset-subgroup legend {
+       width: auto;
+}
+
+.labels-block .fieldset-subgroup legend em,
+.labels-block.fieldset-subgroup legend em {
+       position: relative;
+}
+
+.labels-block .fieldset-subgroup legend strong,
+.labels-block.fieldset-subgroup legend strong {
+       position: relative;
+       top: 0;
+}
+
+.labels-block .fieldset-subgroup ol,
+.labels-block.fieldset-subgroup ol {
+       top: 0;
+       margin: 0;
+       padding: 0.5em 0 0;
+}
\ No newline at end of file