prodaxo-commits Mailing List for prodaxo
Brought to you by:
networkdesign
Menu
▾
▴
prodaxo-commits — ProdaXo SVN Commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(9) |
Feb
|
Mar
(2) |
Apr
(2) |
May
(18) |
Jun
|
Jul
(17) |
Aug
(26) |
Sep
(37) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(22) |
Aug
(3) |
Sep
(3) |
Oct
(12) |
Nov
(3) |
Dec
(22) |
| 2013 |
Jan
(5) |
Feb
(4) |
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <and...@us...> - 2013-05-04 18:37:03
|
Revision: 442
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=442&view=rev
Author: andrekeller
Date: 2013-05-04 18:36:56 +0000 (Sat, 04 May 2013)
Log Message:
-----------
Removed test comment see #17
Modified Paths:
--------------
core/trunk/library/htdocs_sample/_.htaccess
Modified: core/trunk/library/htdocs_sample/_.htaccess
===================================================================
--- core/trunk/library/htdocs_sample/_.htaccess 2013-04-30 16:36:54 UTC (rev 441)
+++ core/trunk/library/htdocs_sample/_.htaccess 2013-05-04 18:36:56 UTC (rev 442)
@@ -1,5 +1,3 @@
-# Test Comment
-
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-04-30 16:24:21
|
Revision: 441
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=441&view=rev
Author: andrekeller
Date: 2013-04-30 16:24:14 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Doxygen test
Modified Paths:
--------------
core/trunk/library/Ndm/Acl.php
Modified: core/trunk/library/Ndm/Acl.php
===================================================================
--- core/trunk/library/Ndm/Acl.php 2013-04-18 10:11:53 UTC (rev 440)
+++ core/trunk/library/Ndm/Acl.php 2013-04-30 16:24:14 UTC (rev 441)
@@ -56,7 +56,13 @@
}
}
-
+
+ /**
+ * TODO: Needs to be documented!
+ *
+ * @param unknown_type $resource
+ * @param unknown_type $parent
+ */
public function addResource($resource, $parent = null)
{
if ($resource instanceof Ndm_Acl_ResourceInterface) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-04-18 10:00:15
|
Revision: 440
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=440&view=rev
Author: andrekeller
Date: 2013-04-18 10:00:06 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Commented a debug line
Modified Paths:
--------------
core/trunk/library/Ndm/Device.php
Modified: core/trunk/library/Ndm/Device.php
===================================================================
--- core/trunk/library/Ndm/Device.php 2013-02-20 13:46:41 UTC (rev 439)
+++ core/trunk/library/Ndm/Device.php 2013-04-18 10:00:06 UTC (rev 440)
@@ -80,7 +80,7 @@
$this->arrUserAgents
);
$this->strUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
- Ndm_Log::debug($this->strUserAgent);
+ //Ndm_Log::debug($this->strUserAgent);
$this->strAccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
if (
isset($_SERVER['HTTP_X_WAP_PROFILE']) ||
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-02-20 13:38:35
|
Revision: 439
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=439&view=rev
Author: andrekeller
Date: 2013-02-20 13:38:25 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Set locale to view
Modified Paths:
--------------
core/trunk/library/Ndm/Controller/Action.php
Modified: core/trunk/library/Ndm/Controller/Action.php
===================================================================
--- core/trunk/library/Ndm/Controller/Action.php 2013-02-19 22:51:32 UTC (rev 438)
+++ core/trunk/library/Ndm/Controller/Action.php 2013-02-20 13:38:25 UTC (rev 439)
@@ -195,7 +195,8 @@
//JDS code added 11.09.2012
//$this->view->isLoggedIn = Zend_Auth::getInstance()->hasIdentity();
- $this->view->objCurrUser = Ndm_Auth::getInstance()->getIdentity();
+ $this->view->objCurrUser = Ndm_Auth::getInstance()->getIdentity();
+ $this->view->objLocale = Zend_Registry::get('Zend_Locale');
//End of JDS code
//TODO: Do this in a nicer way!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-02-19 22:43:37
|
Revision: 438
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=438&view=rev
Author: andrekeller
Date: 2013-02-19 22:43:27 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Corrected tablet layout
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
modules/auth/trunk/views/scripts/auth/tabletlogout.tpl
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2013-02-11 11:51:50 UTC (rev 437)
+++ modules/auth/trunk/controllers/AuthController.php 2013-02-19 22:43:27 UTC (rev 438)
@@ -161,15 +161,17 @@
Zend_Auth::getInstance()->clearIdentity();
$this->objSession->unsetAll();
$this->view->strLogoutMessage = $this->_request->getParam("strLogoutMessage");
- if ($this->arrDevice["name"] == "phone") {
- $this->_forward("phonelogout", "auth", "auth");
- } elseif (get_class($this) == get_class()) {
- $this->_forward("index", "index", "default");
- } else {
- $this->_helper->layout()->disableLayout();
- //Render parent auth/auth/logout.tpl, not exteded school/login/logout.tpl
- $this->view->addScriptPath(APP_PATH . "/auth/views/scripts");
- $this->_helper->viewRenderer->renderScript("auth/logout.tpl");
+ if ($this->arrDevice["name"] == "pc") {
+ if (get_class($this) == get_class()) {
+ $this->_forward("index", "index", "default");
+ } else {
+ $this->_helper->layout()->disableLayout();
+ //Render parent auth/auth/logout.tpl, not exteded school/login/logout.tpl
+ $this->view->addScriptPath(APP_PATH . "/auth/views/scripts");
+ $this->_helper->viewRenderer->renderScript("auth/logout.tpl");
+ }
+ } else {
+ $this->_forward($this->arrDevice["name"] . "logout", "auth", "auth");
}
}
Modified: modules/auth/trunk/views/scripts/auth/tabletlogout.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/tabletlogout.tpl 2013-02-11 11:51:50 UTC (rev 437)
+++ modules/auth/trunk/views/scripts/auth/tabletlogout.tpl 2013-02-19 22:43:27 UTC (rev 438)
@@ -1,4 +1,4 @@
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 350px; text-align: center;">
- <h2>{$strLogoutMessage}</h2>
+ <h1>{$strLogoutMessage}</h1>
<a href="{$complPath}" data-role="button" rel="external">{t}Login again{/t}!</a>
</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-02-11 11:44:07
|
Revision: 437
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=437&view=rev
Author: andrekeller
Date: 2013-02-11 11:44:01 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Translation tags
Modified Paths:
--------------
modules/auth/trunk/views/scripts/auth/phonelogin.tpl
modules/auth/trunk/views/scripts/auth/phonelogout.tpl
modules/auth/trunk/views/scripts/auth/tabletlogin.tpl
modules/auth/trunk/views/scripts/auth/tabletlogout.tpl
Modified: modules/auth/trunk/views/scripts/auth/phonelogin.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/phonelogin.tpl 2013-02-11 11:33:03 UTC (rev 436)
+++ modules/auth/trunk/views/scripts/auth/phonelogin.tpl 2013-02-11 11:44:01 UTC (rev 437)
@@ -1,12 +1,12 @@
<div data-role="header" data-position="fixed" data-theme="b" style="font-size: 8pt;">
- <h1>Login to {$title|default:' '}</h1>
+ <h1>{t}Login to{/t} {$title|default:' '}</h1>
</div>
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 450px;">
<form method="POST" action="{$strFormAction}" data-ajax="false">
<fieldset>
- <label for="strUserName">Username:</label>
+ <label for="strUserName">{t}Username{/t}:</label>
<input type="text" name="strUserName" id="strUserName" class="InputInFocus" /><br>
- <label for="strPassword">Password:</label>
+ <label for="strPassword">{t}Password{/t}:</label>
<input type="password" name="strPassword" id="strPassword" /><br>
<input type="hidden" id="strOrientation" name="strOrientation" value="" />
<div class="ui-grid-a">
@@ -14,7 +14,7 @@
<button type="submit" id="btnOK">OK</button>
</div>
<div class="ui-block-b">
- <a href="default/index/index" data-role="button" rel="external">Cancel</a>
+ <a href="default/index/index" data-role="button" rel="external">{t}Cancel{/t}</a>
</div>
</div>
</fieldset>
Modified: modules/auth/trunk/views/scripts/auth/phonelogout.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/phonelogout.tpl 2013-02-11 11:33:03 UTC (rev 436)
+++ modules/auth/trunk/views/scripts/auth/phonelogout.tpl 2013-02-11 11:44:01 UTC (rev 437)
@@ -1,4 +1,4 @@
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 350px; text-align: center;">
- <h2>{$strLogoutMessage|default:'Thank you for using ProdaXo School'}</h2>
- <a href="{$complPath}" data-role="button" rel="external">Login again!</a>
+ <h2>{$strLogoutMessage}</h2>
+ <a href="{$complPath}" data-role="button" rel="external">{t}Login again{/t}!</a>
</div>
\ No newline at end of file
Modified: modules/auth/trunk/views/scripts/auth/tabletlogin.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/tabletlogin.tpl 2013-02-11 11:33:03 UTC (rev 436)
+++ modules/auth/trunk/views/scripts/auth/tabletlogin.tpl 2013-02-11 11:44:01 UTC (rev 437)
@@ -1,12 +1,12 @@
<div data-role="header" data-position="fixed" data-theme="b" style="font-size: 8pt;">
- <h1>Login to {$title|default:' '}</h1>
+ <h1>{t}Login to{/t} {$title|default:' '}</h1>
</div>
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 450px;">
<form method="POST" action="{$strFormAction}" data-ajax="false">
<fieldset>
- <label for="strUserName">Username:</label>
+ <label for="strUserName">{t}Username{/t}:</label>
<input type="text" name="strUserName" id="strUserName" class="InputInFocus" /><br>
- <label for="strPassword">Password:</label>
+ <label for="strPassword">{t}Password{/t}:</label>
<input type="password" name="strPassword" id="strPassword" /><br>
<input type="hidden" id="strOrientation" name="strOrientation" value="" />
<div class="ui-grid-a">
@@ -14,7 +14,7 @@
<button type="submit" id="btnOK">OK</button>
</div>
<div class="ui-block-b">
- <a href="default/index/index" data-role="button" rel="external">Cancel</a>
+ <a href="default/index/index" data-role="button" rel="external">{t}Cancel{/t}</a>
</div>
</div>
</fieldset>
Modified: modules/auth/trunk/views/scripts/auth/tabletlogout.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/tabletlogout.tpl 2013-02-11 11:33:03 UTC (rev 436)
+++ modules/auth/trunk/views/scripts/auth/tabletlogout.tpl 2013-02-11 11:44:01 UTC (rev 437)
@@ -1,4 +1,4 @@
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 350px; text-align: center;">
- <h2>{$strLogoutMessage|default:'Thank you for using ProdaXo School'}</h2>
- <a href="{$complPath}" data-role="button" rel="external">Login again!</a>
+ <h2>{$strLogoutMessage}</h2>
+ <a href="{$complPath}" data-role="button" rel="external">{t}Login again{/t}!</a>
</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-02-11 11:26:05
|
Revision: 436
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=436&view=rev
Author: andrekeller
Date: 2013-02-11 11:25:58 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Application title in logout page
Modified Paths:
--------------
modules/auth/trunk/views/scripts/auth/logout.tpl
Modified: modules/auth/trunk/views/scripts/auth/logout.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/logout.tpl 2013-01-31 11:45:13 UTC (rev 435)
+++ modules/auth/trunk/views/scripts/auth/logout.tpl 2013-02-11 11:25:58 UTC (rev 436)
@@ -3,14 +3,14 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
- <title>{$maintitle}</title>
+ <title>ProdaXo</title>
<base href="{$complPath}/" />
<link rel="shortcut icon" type="image/x-icon" href="{$complPath}/template/default/images/ndm.ico" />
<link rel="stylesheet" href="template/default/css/20_app.css" type="text/css" />
</head>
<body style="background-color: #eee;">
<div class="LogoutContainer">
- <h2>{$strLogoutMessage|default:'Thank you for using ProdaXo School'}</h2>
+ <h2>{$strLogoutMessage}</h2>
<a href="{$complPath}">Login again!</a>
</div>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-01-31 11:38:44
|
Revision: 435
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=435&view=rev
Author: andrekeller
Date: 2013-01-31 11:38:37 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
Tablet support
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2013-01-30 13:24:05 UTC (rev 434)
+++ modules/auth/trunk/controllers/AuthController.php 2013-01-31 11:38:37 UTC (rev 435)
@@ -117,14 +117,15 @@
}
$this->view->strLoginResults = $strLoginResults;
$this->view->strUserName = $strUserName;
- if ($this->arrDevice["name"] == "phone") {
+ //if ($this->arrDevice["name"] == "phone") {
+ if ($this->arrDevice["name"] != "pc") {
$objRequest = $this->_request;
$this->view->strFormAction = $objRequest->getModuleName() . '/' . $objRequest->getControllerName() . '/' . $objRequest->getActionName();
- $this->_forward("phonelogin", "auth", "auth");
+ //$this->_forward("phonelogin", "auth", "auth");
+ $this->_forward($this->arrDevice["name"] . "login", "auth", "auth");
}
}
-
/**
* Forward login to phone view
*/
@@ -138,6 +139,21 @@
}
/**
+ * Forward login to tablet view
+ */
+ public function tabletloginAction() {
+ //If we are here login error occured and we should redirect to default screen
+ //because for the tablet login place is on default screen
+ $this->_redirect("default/index/index?strLoginResults=" . $this->view->strLoginResults . "&strUserName=" . $this->view->strUserName);
+ }
+
+ /**
+ * Forward logout to tablet view
+ */
+ public function tabletlogoutAction() {
+ }
+
+ /**
* Logout current user.
*/
public function logoutAction() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-01-30 13:18:04
|
Revision: 434
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=434&view=rev
Author: andrekeller
Date: 2013-01-30 13:17:57 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Tablet support
Modified Paths:
--------------
modules/auth/trunk/views/scripts/auth/phonelogout.tpl
Added Paths:
-----------
modules/auth/trunk/views/scripts/auth/tabletlogin.tpl
modules/auth/trunk/views/scripts/auth/tabletlogout.tpl
Modified: modules/auth/trunk/views/scripts/auth/phonelogout.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/phonelogout.tpl 2013-01-27 22:41:58 UTC (rev 433)
+++ modules/auth/trunk/views/scripts/auth/phonelogout.tpl 2013-01-30 13:17:57 UTC (rev 434)
@@ -1,4 +1,4 @@
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 350px; text-align: center;">
<h2>{$strLogoutMessage|default:'Thank you for using ProdaXo School'}</h2>
- <a href="school/login/login" data-role="button" rel="external">Login again!</a>
+ <a href="{$complPath}" data-role="button" rel="external">Login again!</a>
</div>
\ No newline at end of file
Added: modules/auth/trunk/views/scripts/auth/tabletlogin.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/tabletlogin.tpl (rev 0)
+++ modules/auth/trunk/views/scripts/auth/tabletlogin.tpl 2013-01-30 13:17:57 UTC (rev 434)
@@ -0,0 +1,35 @@
+<div data-role="header" data-position="fixed" data-theme="b" style="font-size: 8pt;">
+ <h1>Login to {$title|default:' '}</h1>
+</div>
+<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 450px;">
+ <form method="POST" action="{$strFormAction}" data-ajax="false">
+ <fieldset>
+ <label for="strUserName">Username:</label>
+ <input type="text" name="strUserName" id="strUserName" class="InputInFocus" /><br>
+ <label for="strPassword">Password:</label>
+ <input type="password" name="strPassword" id="strPassword" /><br>
+ <input type="hidden" id="strOrientation" name="strOrientation" value="" />
+ <div class="ui-grid-a">
+ <div class="ui-block-a">
+ <button type="submit" id="btnOK">OK</button>
+ </div>
+ <div class="ui-block-b">
+ <a href="default/index/index" data-role="button" rel="external">Cancel</a>
+ </div>
+ </div>
+ </fieldset>
+ </form>
+</div>
+<div data-role="footer" data-position="fixed" data-theme="b" style="font-size: 8pt;">
+ {if $loginFailed}
+ {t}Incorrect username or password{/t}
+ {else}
+ {t}Enter username and password{/t}
+ {/if}
+</div>
+<script type="text/javascript" >
+ {literal}
+ var objWindow = $(window);
+ $("#strOrientation").val(objWindow.innerWidth() > objWindow.innerHeight() ? "landscape" : "portrait");
+ {/literal}
+</script>
\ No newline at end of file
Added: modules/auth/trunk/views/scripts/auth/tabletlogout.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/tabletlogout.tpl (rev 0)
+++ modules/auth/trunk/views/scripts/auth/tabletlogout.tpl 2013-01-30 13:17:57 UTC (rev 434)
@@ -0,0 +1,4 @@
+<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 350px; text-align: center;">
+ <h2>{$strLogoutMessage|default:'Thank you for using ProdaXo School'}</h2>
+ <a href="{$complPath}" data-role="button" rel="external">Login again!</a>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-01-27 23:07:33
|
Revision: 433
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=433&view=rev
Author: andrekeller
Date: 2013-01-27 22:59:38 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Center login input
Modified Paths:
--------------
modules/auth/trunk/views/scripts/auth/login.tpl
Modified: modules/auth/trunk/views/scripts/auth/login.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/login.tpl 2013-01-08 19:58:18 UTC (rev 432)
+++ modules/auth/trunk/views/scripts/auth/login.tpl 2013-01-27 22:59:38 UTC (rev 433)
@@ -1,33 +1,34 @@
-{t}Welcome to{/t} <strong>ProdaXo</strong>
-
-<br />
-
-{* if $loginRequired}
- {t}Login is required to view the requested site{/t}.
-{/if}
-
-{if $loginFailed}
- {t}The username or password you entered is incorrect{/t}.
-{/if *}
-
-{$strLoginResults|t}
-
-<br />
-{if $strUserName eq ""}
- {assign var=strUserNameClass value="class='InputInFocus'"}
- {assign var=strPasswordClass value=""}
-{else}
- {assign var=strUserNameClass value=""}
- {assign var=strPasswordClass value="class='InputInFocus'"}
-{/if}
-<form action="{$module}/{$controller}/login" method="post">
- <div id="divLogin">
- <label for="strUserName" >{t}Username{/t}:</label>
- <input type="text" name="strUserName" id="strUserName" {$strUserNameClass} value="{$strUserName}" />
- <br /><br />
- <label for="strPassword" >{t}Password{/t}:</label>
- <input type="password" name="strPassword" id="strPassword" {$strPasswordClass} />
- <br /><br />
- <input type="submit" value="{t}OK{/t}" style="display: block; width: 50px; margin: 0px auto;" />
- </div>
-</form>
+<div id="divLoginContainer">
+
+ <div id="divLoginHeader">{t}Welcome to{/t} <strong>ProdaXo</strong></div>
+
+ {* if $loginRequired}
+ {t}Login is required to view the requested site{/t}.
+ {/if}
+
+ {if $loginFailed}
+ {t}The username or password you entered is incorrect{/t}.
+ {/if *}
+
+ {* $strLoginResults|t *}
+
+ {if $strUserName eq ""}
+ {assign var=strUserNameClass value="class='InputInFocus'"}
+ {assign var=strPasswordClass value=""}
+ {else}
+ {assign var=strUserNameClass value=""}
+ {assign var=strPasswordClass value="class='InputInFocus'"}
+ {/if}
+ <form action="{$module}/{$controller}/login" method="post">
+ <div id="divLogin">
+ <label for="strUserName" >{t}Username{/t}:</label>
+ <input type="text" name="strUserName" id="strUserName" {$strUserNameClass} value="{$strUserName}" />
+ <br /><br />
+ <label for="strPassword" >{t}Password{/t}:</label>
+ <input type="password" name="strPassword" id="strPassword" {$strPasswordClass} />
+ <br /><br />
+ <input id="btnOK" type="submit" value="{t}OK{/t}"/>
+ </div>
+ </form>
+ <div id="divLoginFooter">{$strLoginResults|t}</div>
+</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-01-08 19:53:07
|
Revision: 432
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=432&view=rev
Author: andrekeller
Date: 2013-01-08 19:53:01 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Added support for tablet
Modified Paths:
--------------
core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php
Modified: core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php
===================================================================
--- core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php 2013-01-08 19:09:20 UTC (rev 431)
+++ core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php 2013-01-08 19:53:01 UTC (rev 432)
@@ -62,9 +62,9 @@
$objSession->strRealDevice = $objSession->strDevice;
$objSession->strOrientation = "portrait";
}
- if ($objSession->strDevice == "phone") {
+ if ($objSession->strDevice != "pc") {
$layout = Zend_Layout::getMvcInstance();
- $layout->setLayout("phonelayout");
+ $layout->setLayout($objSession->strDevice . "layout");
}
$arrDevice = array(
"name" => $objSession->strDevice,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-01-08 19:04:07
|
Revision: 431
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=431&view=rev
Author: andrekeller
Date: 2013-01-08 19:04:00 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Replaced all occurrence of _forward to _redirect
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-18 12:29:51 UTC (rev 430)
+++ modules/auth/trunk/controllers/AuthController.php 2013-01-08 19:04:00 UTC (rev 431)
@@ -56,7 +56,8 @@
$arrResources = $objSelect->query()->fetchAll(Zend_Db::FETCH_COLUMN, 0);
if (count($arrResources) == 0) {
//Foward to default
- return $this->_forward('index', 'index', 'default');
+ //return $this->_forward('index', 'index', 'default');
+ $this->_redirect("default/index/index");
} else if ($arrResources[0] == "site") {
//Foward to first tab of the first navigation
$objSelect1 = $objManager->getModel("Mod_Nav_Tab")->getSelect();
@@ -66,11 +67,13 @@
->limit(1);
$arrTab = $objManager->loadObjects($objSelect1);
$objTab = current($arrTab);
- return $this->_forward("index", $objTab->controller, $objTab->module);
+ //return $this->_forward("index", $objTab->controller, $objTab->module);
+ $this->_redirect($objTab->module . "/" . $objTab->controller . "/index");
} else {
//Forward to first accessible resource
$arrResourceParts = explode("/", $arrResources[0]);
- return $this->_forward("index", $arrResourceParts[2], $arrResourceParts[1]);
+ //return $this->_forward("index", $arrResourceParts[2], $arrResourceParts[1]);
+ $this->_redirect($arrResourceParts[1] . "/" . $arrResourceParts[2] . "/index");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-18 12:26:12
|
Revision: 430
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=430&view=rev
Author: andrekeller
Date: 2012-12-18 12:26:05 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Device identification
Modified Paths:
--------------
core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php
Modified: core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php
===================================================================
--- core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php 2012-12-07 11:40:47 UTC (rev 429)
+++ core/trunk/library/Ndm/Controller/Plugin/ActionSetup.php 2012-12-18 12:26:05 UTC (rev 430)
@@ -54,20 +54,21 @@
if ($objDevice->isTablet()) {
$objSession->strDevice = "tablet";
} else {
- $layout = Zend_Layout::getMvcInstance();
- $layout->setLayout("phonelayout");
$objSession->strDevice = "phone";
}
} else {
$objSession->strDevice = "pc";
}
+ $objSession->strRealDevice = $objSession->strDevice;
$objSession->strOrientation = "portrait";
- } elseif ($objSession->strDevice == "phone") {
+ }
+ if ($objSession->strDevice == "phone") {
$layout = Zend_Layout::getMvcInstance();
$layout->setLayout("phonelayout");
}
$arrDevice = array(
"name" => $objSession->strDevice,
+ "realname" => $objSession->strRealDevice,
"orientation" => $objSession->strOrientation
);
Zend_Registry::set("device", $arrDevice);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 11:37:58
|
Revision: 429
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=429&view=rev
Author: andrekeller
Date: 2012-12-07 11:37:52 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 11:34:43 UTC (rev 428)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 11:37:52 UTC (rev 429)
@@ -45,7 +45,6 @@
* Default is to show first accessible page for the current user.
*/
public function afterLogin($objCurrUser) {
- Ndm_Log::debug("Parent afterLogin");
//Get accessible resources of user role
$objManager = Ndm_Object_Manager::getInstance();
$objSelect = $objManager->getDb()->select();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 11:32:05
|
Revision: 428
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=428&view=rev
Author: andrekeller
Date: 2012-12-07 11:31:54 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 11:27:00 UTC (rev 427)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 11:31:54 UTC (rev 428)
@@ -99,7 +99,6 @@
$objResult = $objAuth->authenticate($objAdapter);
$objCurrUser = $objResult->getIdentity();
if ($objResult->isValid()) { // Login successful
- Ndm_Log::debug($this->arrDevice["name"] . ' ' . get_class($this));
$this->afterLogin($objCurrUser);
return;
}
@@ -119,7 +118,6 @@
if ($this->arrDevice["name"] == "phone") {
$objRequest = $this->_request;
$this->view->strFormAction = $objRequest->getModuleName() . '/' . $objRequest->getControllerName() . '/' . $objRequest->getActionName();
- Ndm_Log::debug($this->view->strFormAction);
$this->_forward("phonelogin", "auth", "auth");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 11:23:53
|
Revision: 427
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=427&view=rev
Author: andrekeller
Date: 2012-12-07 11:23:46 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/views/scripts/auth/phonelogin.tpl
Modified: modules/auth/trunk/views/scripts/auth/phonelogin.tpl
===================================================================
--- modules/auth/trunk/views/scripts/auth/phonelogin.tpl 2012-12-07 11:15:20 UTC (rev 426)
+++ modules/auth/trunk/views/scripts/auth/phonelogin.tpl 2012-12-07 11:23:46 UTC (rev 427)
@@ -2,7 +2,7 @@
<h1>Login to {$title|default:' '}</h1>
</div>
<div data-role="content" data-inset="true" data-theme="b" style="background: url(template/default/images/logo.png) no-repeat center bottom; height: 450px;">
- <form method="POST" action="auth/auth/login" data-ajax="false">
+ <form method="POST" action="{$strFormAction}" data-ajax="false">
<fieldset>
<label for="strUserName">Username:</label>
<input type="text" name="strUserName" id="strUserName" class="InputInFocus" /><br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 11:13:08
|
Revision: 426
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=426&view=rev
Author: andrekeller
Date: 2012-12-07 11:13:01 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 10:21:18 UTC (rev 425)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 11:13:01 UTC (rev 426)
@@ -119,6 +119,7 @@
if ($this->arrDevice["name"] == "phone") {
$objRequest = $this->_request;
$this->view->strFormAction = $objRequest->getModuleName() . '/' . $objRequest->getControllerName() . '/' . $objRequest->getActionName();
+ Ndm_Log::debug($this->view->strFormAction);
$this->_forward("phonelogin", "auth", "auth");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 10:19:13
|
Revision: 425
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=425&view=rev
Author: andrekeller
Date: 2012-12-07 10:19:02 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:45:20 UTC (rev 424)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 10:19:02 UTC (rev 425)
@@ -45,6 +45,7 @@
* Default is to show first accessible page for the current user.
*/
public function afterLogin($objCurrUser) {
+ Ndm_Log::debug("Parent afterLogin");
//Get accessible resources of user role
$objManager = Ndm_Object_Manager::getInstance();
$objSelect = $objManager->getDb()->select();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 09:42:55
|
Revision: 424
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=424&view=rev
Author: andrekeller
Date: 2012-12-07 09:42:49 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:28:02 UTC (rev 423)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:42:49 UTC (rev 424)
@@ -98,7 +98,7 @@
$objResult = $objAuth->authenticate($objAdapter);
$objCurrUser = $objResult->getIdentity();
if ($objResult->isValid()) { // Login successful
- Ndm_Log::debug($this->arrDevice["name"]);
+ Ndm_Log::debug($this->arrDevice["name"] . ' ' . get_class($this));
$this->afterLogin($objCurrUser);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 09:25:55
|
Revision: 423
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=423&view=rev
Author: andrekeller
Date: 2012-12-07 09:25:48 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:20:04 UTC (rev 422)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:25:48 UTC (rev 423)
@@ -97,8 +97,8 @@
if ($objAdapter === null) continue;
$objResult = $objAuth->authenticate($objAdapter);
$objCurrUser = $objResult->getIdentity();
- Ndm_Log::debug($this->arrDevice["name"]);
if ($objResult->isValid()) { // Login successful
+ Ndm_Log::debug($this->arrDevice["name"]);
$this->afterLogin($objCurrUser);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 09:17:55
|
Revision: 422
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=422&view=rev
Author: andrekeller
Date: 2012-12-07 09:17:48 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:12:19 UTC (rev 421)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:17:48 UTC (rev 422)
@@ -95,9 +95,9 @@
foreach ($objModuleManager->getModulesImplementing('Ndm_Auth_UserManagerInterface') as $objModule) {
$objAdapter = $objModule->userManagerInterface_getAuthAdapter($strUserName, $strPassword);
if ($objAdapter === null) continue;
- Ndm_Log::debug($this->arrDevice["name"]);
$objResult = $objAuth->authenticate($objAdapter);
$objCurrUser = $objResult->getIdentity();
+ Ndm_Log::debug($this->arrDevice["name"]);
if ($objResult->isValid()) { // Login successful
$this->afterLogin($objCurrUser);
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 09:10:23
|
Revision: 421
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=421&view=rev
Author: andrekeller
Date: 2012-12-07 09:10:12 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 08:29:51 UTC (rev 420)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 09:10:12 UTC (rev 421)
@@ -95,6 +95,7 @@
foreach ($objModuleManager->getModulesImplementing('Ndm_Auth_UserManagerInterface') as $objModule) {
$objAdapter = $objModule->userManagerInterface_getAuthAdapter($strUserName, $strPassword);
if ($objAdapter === null) continue;
+ Ndm_Log::debug($this->arrDevice["name"]);
$objResult = $objAuth->authenticate($objAdapter);
$objCurrUser = $objResult->getIdentity();
if ($objResult->isValid()) { // Login successful
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 08:26:54
|
Revision: 420
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=420&view=rev
Author: andrekeller
Date: 2012-12-07 08:26:48 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 08:21:09 UTC (rev 419)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 08:26:48 UTC (rev 420)
@@ -30,7 +30,6 @@
public function init() {
$this->objSession = new Ndm_Session_Namespace("jds");
$this->arrDevice = Zend_Registry::get("device");
- Ndm_Log::debug($this->arrDevice["name"]);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 08:19:11
|
Revision: 419
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=419&view=rev
Author: andrekeller
Date: 2012-12-07 08:19:01 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 08:09:23 UTC (rev 418)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 08:19:01 UTC (rev 419)
@@ -29,7 +29,8 @@
*/
public function init() {
$this->objSession = new Ndm_Session_Namespace("jds");
- //$this->arrDevice = Zend_Registry::get("device");
+ $this->arrDevice = Zend_Registry::get("device");
+ Ndm_Log::debug($this->arrDevice["name"]);
}
/**
@@ -87,7 +88,6 @@
* Show login window or validate an user
*/
public function loginAction() {
- $this->arrDevice = Zend_Registry::get("device");
if ($this->_request->isPost()) {
$strUserName = $this->_request->getPost('strUserName');
$strPassword = $this->_request->getPost('strPassword');
@@ -99,7 +99,6 @@
$objResult = $objAuth->authenticate($objAdapter);
$objCurrUser = $objResult->getIdentity();
if ($objResult->isValid()) { // Login successful
- Ndm_Log::debug($arrDevice["name"]);
$this->afterLogin($objCurrUser);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-12-07 08:07:31
|
Revision: 418
http://prodaxo.svn.sourceforge.net/prodaxo/?rev=418&view=rev
Author: andrekeller
Date: 2012-12-07 08:07:21 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Finding errors
Modified Paths:
--------------
modules/auth/trunk/controllers/AuthController.php
Modified: modules/auth/trunk/controllers/AuthController.php
===================================================================
--- modules/auth/trunk/controllers/AuthController.php 2012-12-07 07:56:25 UTC (rev 417)
+++ modules/auth/trunk/controllers/AuthController.php 2012-12-07 08:07:21 UTC (rev 418)
@@ -29,7 +29,7 @@
*/
public function init() {
$this->objSession = new Ndm_Session_Namespace("jds");
- $this->arrDevice = Zend_Registry::get("device");
+ //$this->arrDevice = Zend_Registry::get("device");
}
/**
@@ -87,6 +87,7 @@
* Show login window or validate an user
*/
public function loginAction() {
+ $this->arrDevice = Zend_Registry::get("device");
if ($this->_request->isPost()) {
$strUserName = $this->_request->getPost('strUserName');
$strPassword = $this->_request->getPost('strPassword');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|