From 5a401d1c37b7242942bfdc581a5b5f2d91850ef0 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 23 Nov 2013 14:51:29 +0100 Subject: Git decided to fix line endings.. --- framework/Wsat/pages/TWsatLogin.php | 58 +++--- framework/Wsat/pages/TWsatScaffolding.php | 28 +-- framework/Wsat/pages/layout/TWsatLayout.php | 62 +++---- framework/Wsat/pages/layout/TWsatLayout.tpl | 104 +++++------ framework/Wsat/themes/.htaccess | 2 +- framework/Wsat/themes/PradoSoft/main.css | 264 ++++++++++++++-------------- 6 files changed, 259 insertions(+), 259 deletions(-) (limited to 'framework/Wsat') diff --git a/framework/Wsat/pages/TWsatLogin.php b/framework/Wsat/pages/TWsatLogin.php index 7435d75d..69f8cc39 100644 --- a/framework/Wsat/pages/TWsatLogin.php +++ b/framework/Wsat/pages/TWsatLogin.php @@ -1,30 +1,30 @@ -getService()->getPassword(); - $user_pass = $this->password->Text; - - if ($user_pass === $config_pass) { - $this->Session["wsat_password"] = $config_pass; - - $authManager = $this->Application->getModule('auth'); - $url = $authManager->ReturnUrl; - if (empty($url)) { - $url = $this->Service->constructUrl('TWsatHome'); - } - $this->Response->redirect($url); - } else { - echo "user or pass wrong"; - } - } - -} - +getService()->getPassword(); + $user_pass = $this->password->Text; + + if ($user_pass === $config_pass) { + $this->Session["wsat_password"] = $config_pass; + + $authManager = $this->Application->getModule('auth'); + $url = $authManager->ReturnUrl; + if (empty($url)) { + $url = $this->Service->constructUrl('TWsatHome'); + } + $this->Response->redirect($url); + } else { + echo "user or pass wrong"; + } + } + +} + ?> \ No newline at end of file diff --git a/framework/Wsat/pages/TWsatScaffolding.php b/framework/Wsat/pages/TWsatScaffolding.php index afa00273..ce5860d3 100644 --- a/framework/Wsat/pages/TWsatScaffolding.php +++ b/framework/Wsat/pages/TWsatScaffolding.php @@ -1,15 +1,15 @@ - \ No newline at end of file diff --git a/framework/Wsat/pages/layout/TWsatLayout.php b/framework/Wsat/pages/layout/TWsatLayout.php index e799125b..ce337265 100644 --- a/framework/Wsat/pages/layout/TWsatLayout.php +++ b/framework/Wsat/pages/layout/TWsatLayout.php @@ -1,32 +1,32 @@ -validateSecurity(); - } - - private function validateSecurity() { - if ($this->Session["wsat_password"] !== $this->getService()->getPassword()) { - if (!$this->getPage() instanceof TWsatLogin) { - $url = $this->Service->constructUrl('TWsatLogin'); - $this->Response->redirect($url); - } - } - } - - public function logout() { - $this->Session["wsat_password"] = ""; - $url = $this->Service->constructUrl('TWsatLogin'); - $this->Response->redirect($url); - } - -} - +validateSecurity(); + } + + private function validateSecurity() { + if ($this->Session["wsat_password"] !== $this->getService()->getPassword()) { + if (!$this->getPage() instanceof TWsatLogin) { + $url = $this->Service->constructUrl('TWsatLogin'); + $this->Response->redirect($url); + } + } + } + + public function logout() { + $this->Session["wsat_password"] = ""; + $url = $this->Service->constructUrl('TWsatLogin'); + $this->Response->redirect($url); + } + +} + ?> \ No newline at end of file diff --git a/framework/Wsat/pages/layout/TWsatLayout.tpl b/framework/Wsat/pages/layout/TWsatLayout.tpl index 37cf4183..d91ff333 100644 --- a/framework/Wsat/pages/layout/TWsatLayout.tpl +++ b/framework/Wsat/pages/layout/TWsatLayout.tpl @@ -1,53 +1,53 @@ - - - - - - - - - - - - -
-
-
 | 
-
 | 
-
 | 
-
-
- -
-
-
-
Code Generation
-
    -
    • -
    • -
-
-
- -
- -
- -
-
- - - - + + + + + + + + + + + + +
+
+
 | 
+
 | 
+
 | 
+
+
+ +
+
+
+
Code Generation
+
    +
    • +
    • +
+
+
+ +
+ +
+ +
+
+ + + + \ No newline at end of file diff --git a/framework/Wsat/themes/.htaccess b/framework/Wsat/themes/.htaccess index 1caf5e97..f7661d04 100644 --- a/framework/Wsat/themes/.htaccess +++ b/framework/Wsat/themes/.htaccess @@ -1 +1 @@ -allow from all +allow from all diff --git a/framework/Wsat/themes/PradoSoft/main.css b/framework/Wsat/themes/PradoSoft/main.css index 6c609e95..ed36c238 100644 --- a/framework/Wsat/themes/PradoSoft/main.css +++ b/framework/Wsat/themes/PradoSoft/main.css @@ -1,133 +1,133 @@ -html, body{ - margin: 0px; - padding: 0px; - font-family: 'Lucida Grande', Verdana, Geneva, Lucida, Helvetica, Arial, sans-serif; - font-weight: normal; -} - -#header { - font-size:25px; - font-weight:bold; - color: #666; -} - -.logo{ - width: 204px; - height:100px; - background-image: url('imgs/pradologo.gif'); - background-repeat: no-repeat; - float: left; -} - -.mantisbg{ - width: 221px; - height: 100px; - background-image: url('imgs/mantisbg.jpg'); - background-repeat: no-repeat; - float: right; -} - -.mainmenu { - padding:10px; - padding-right:10px; - background:#EDEDED; - border-bottom: 1px solid #A6A6A6; - border-top: 1px solid #DCDCDC; - color:white; - text-align:right; - font-size: 10pt; -} - -.mainmenu a { - color:#737373; - text-decoration:none; -} - -.mainmenu a:hover { - color: #FF0000; -} - -#toc { - background-color: #F3F3F3; - width:220px; - padding:0px 10px 0px 10px; - float: left; -} - -#content { - padding: 1em 1em 1em 1em; - line-height: 135%; - float: left; -} - -.topic { - font-size: 9pt; - padding: 0px 0px 0px 0px; -} - -.topic div { - background-image: url('imgs/arrowdown.gif'); - background-repeat: no-repeat; - background-position: left center; - margin: 0px; - font-size: 8pt; - font-weight:bold; - color:#2A480A; - padding: 5px; - padding-left: 15px; - border-top: 1px solid #fff; - border-bottom: 1px solid #E2E2E2; -} - -.topic ul -{ - margin: 0px; - padding: 0px; -} - -.topic ul li -{ - list-style: none; - margin: 0px; - padding: 5px; - padding-left: 15px; - border-bottom: 1px dotted #D8D8D8; -} - -.topic a { - color:#4F811A; - font-size: 8pt; - text-decoration: none; -} - -.topic a:hover { - color:#2A480A; -} - -/* form styles */ -.form_row{ - margin: 10px; -} - -.in_text{ - width: 250px; -} - -.login_form{ - text-align: center; - margin: 30px auto; - border: 1px solid red; - border-radius: 5px; - padding: 10px; - width: 250px; - font-size: 11px; -} - -#footer { - clear:both; - color: gray; - font-size:8pt; - text-align:center; - margin-top:25px; - padding:10px; +html, body{ + margin: 0px; + padding: 0px; + font-family: 'Lucida Grande', Verdana, Geneva, Lucida, Helvetica, Arial, sans-serif; + font-weight: normal; +} + +#header { + font-size:25px; + font-weight:bold; + color: #666; +} + +.logo{ + width: 204px; + height:100px; + background-image: url('imgs/pradologo.gif'); + background-repeat: no-repeat; + float: left; +} + +.mantisbg{ + width: 221px; + height: 100px; + background-image: url('imgs/mantisbg.jpg'); + background-repeat: no-repeat; + float: right; +} + +.mainmenu { + padding:10px; + padding-right:10px; + background:#EDEDED; + border-bottom: 1px solid #A6A6A6; + border-top: 1px solid #DCDCDC; + color:white; + text-align:right; + font-size: 10pt; +} + +.mainmenu a { + color:#737373; + text-decoration:none; +} + +.mainmenu a:hover { + color: #FF0000; +} + +#toc { + background-color: #F3F3F3; + width:220px; + padding:0px 10px 0px 10px; + float: left; +} + +#content { + padding: 1em 1em 1em 1em; + line-height: 135%; + float: left; +} + +.topic { + font-size: 9pt; + padding: 0px 0px 0px 0px; +} + +.topic div { + background-image: url('imgs/arrowdown.gif'); + background-repeat: no-repeat; + background-position: left center; + margin: 0px; + font-size: 8pt; + font-weight:bold; + color:#2A480A; + padding: 5px; + padding-left: 15px; + border-top: 1px solid #fff; + border-bottom: 1px solid #E2E2E2; +} + +.topic ul +{ + margin: 0px; + padding: 0px; +} + +.topic ul li +{ + list-style: none; + margin: 0px; + padding: 5px; + padding-left: 15px; + border-bottom: 1px dotted #D8D8D8; +} + +.topic a { + color:#4F811A; + font-size: 8pt; + text-decoration: none; +} + +.topic a:hover { + color:#2A480A; +} + +/* form styles */ +.form_row{ + margin: 10px; +} + +.in_text{ + width: 250px; +} + +.login_form{ + text-align: center; + margin: 30px auto; + border: 1px solid red; + border-radius: 5px; + padding: 10px; + width: 250px; + font-size: 11px; +} + +#footer { + clear:both; + color: gray; + font-size:8pt; + text-align:center; + margin-top:25px; + padding:10px; } \ No newline at end of file -- cgit v1.2.3