/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to DuggaSys/changePassword/pageframe.html.php

  • Committer: Gustav Hartvigsson
  • Date: 2013-04-04 17:50:47 UTC
  • mfrom: (11.2.3 teamBranch)
  • Revision ID: gustav.hartvigsson@gmail.com-20130404175047-rfrknwjirjq330tg
Merged implementation group 2's team branch into trunk, at end-of-day 20130404.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
<html>
2
2
        <head>
3
 
                <meta charset="utf-8" />
4
 
                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
 
                <link href="../../css/base.css" rel="stylesheet" type="text/css" />
6
 
                <link href="../../css/app.css" rel="stylesheet" type="text/css" />
7
 
                <script type="text/javascript" src="../../js/jquery-1.8.0.min.js"></script>
8
 
                <title><?php $pagetitle ?></title>
9
 
                <script type="text/javascript">
 
3
                <meta charset = "utf-8" />
 
4
                <meta http-equiv = "Content-Type" content = "text/html; charset=utf-8" />
 
5
                <link href = "../../css/base.css" rel = "stylesheet" type = "text/css" />
 
6
                <link href = "../../css/app.css" rel = "stylesheet" type = "text/css" />
 
7
                <script type = "text/javascript" src = "../../js/jquery-1.8.0.min.js"></script>
 
8
                <title>
 
9
                        <?php 
 
10
                                $pagetitle 
 
11
                        ?>
 
12
                </title>
 
13
                <script type = "text/javascript">
10
14
                        $(document).ready(function() {
11
15
                                /* $('form').find(':input[type=submit]').focus(function() {
12
16
                                        target = this;
23
27
                                        return answer // answer is a boolean
24
28
                                });  
25
29
                                <?php 
26
 
                                if(isset($_POST['scrolly'])) { 
27
 
                                        echo '$(document).scrollTop('.$_POST['scrolly'].');';
28
 
                                        //echo 'alert("setting scrolly");';
29
 
                                }       
 
30
                                        if(isset($_POST['scrolly'])) { 
 
31
                                                echo '$(document).scrollTop('.$_POST['scrolly'].');';
 
32
                                                //echo 'alert("setting scrolly");';
 
33
                                        }       
30
34
                                ?>
31
35
                        });
32
 
                        
33
 
                
34
36
                </script>
35
37
        </head>
36
38
        <body>
37
 
        <div id="wrapper">
38
 
                <div id="menu">
39
 
                        <?php include "menu.php"; ?>
40
 
                        </div>
41
 
                                <div id="content">
42
 
                                <?php
43
 
                                if (isset($errorMsg) && $errorMsg != "") {
44
 
                                        echo "<p class='errorMsg'>".$errorMsg."</p>";
45
 
                                } 
46
 
                                if (isset($userMsg) && $userMsg != "") {
47
 
                                        echo "<h3>".$userMsg."</h3>";
48
 
                                }
49
 
                        ?>
50
 
                        <?php
51
 
                                // DEBUG //////
52
 
                                /*echo "<pre>";
53
 
                                print_r($_POST);
54
 
                                //print_r($_SESSION);
55
 
                                echo "</pre>";*/
56
 
                                ///////////////
57
 
                        ?>
58
 
                        <?php include $content; ?>
59
 
                        </div>
60
 
                        <div id="footer">
 
39
                <div id = "wrapper">
 
40
                        <div id = "menu">
 
41
                                <?php 
 
42
                                        include "menu.php"; 
 
43
                                ?>
 
44
                        </div>
 
45
                        <div id = "content">
 
46
                                <?php
 
47
                                        if( isset( $errorMsg ) && $errorMsg != "") {
 
48
                                                echo "<p class='errorMsg'>".$errorMsg."</p>";
 
49
                                        } 
 
50
                                        if( isset( $userMsg ) && $userMsg != "") {
 
51
                                                echo "<h3>".$userMsg."</h3>";
 
52
                                        }
 
53
                                ?>
 
54
                                <?php
 
55
                                        // DEBUG //////
 
56
                                        /*echo "<pre>";
 
57
                                        print_r($_POST);
 
58
                                        //print_r($_SESSION);
 
59
                                        echo "</pre>";*/
 
60
                                        ///////////////
 
61
                                ?>
 
62
                                <?php 
 
63
                                        include $content; 
 
64
                                ?>
 
65
                        </div>
 
66
                        <div id = "footer">
61
67
                                <p>Page footer</p>
62
68
                                <?php
63
69
                                        // DEBUG //////