Subversion Repositories SmartDukaan

Rev

Rev 1036 | Rev 1337 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1036 Rev 1125
Line 5... Line 5...
5 
    <!-- Prevent MS Office toolbar from changing layout -->
 5 
    <!-- Prevent MS Office toolbar from changing layout -->
6 
    <meta http-equiv="imagetoolbar" content="false" />
 6 
    <meta http-equiv="imagetoolbar" content="false" />
7 
    <meta name="MSSmartTagsPreventParsing" content="true" />
 7 
    <meta name="MSSmartTagsPreventParsing" content="true" />
8 
    <title>Best Sellers</title>
 8 
    <title>Best Sellers</title>
9 
 
 9 
 
10 
<<<<<<< .mine
 - 
 
11 
#include ( "templates/commoncssfiles.vm" )
 10 
#include ( "templates/commoncssfiles.vm" )
12 
=======
 - 
 
13 
    #include ( "templates/commoncssfiles.vm" )
 - 
 
14 
    #include ( "templates/commonjsfiles.vm" )
 - 
 
15 
>>>>>>> .r941
 - 
 
16 
 
 - 
 
17 
<<<<<<< .mine
 - 
 
18 
=======
 - 
 
19 
    <script type="text/javascript">
 - 
 
20 
      $(document).ready(function(){
 - 
 
21 
        $("#frmForgotPassword").validate({
 - 
 
22 
          rules: {
 - 
 
23 
            email: {
 - 
 
24 
              required: true,
 - 
 
25 
              email: true
 - 
 
26 
            }
 - 
 
27 
          }
 - 
 
28 
        });
 - 
 
29 
      });
 - 
 
30 
    </script>
 - 
 
31 
 
 - 
 
32 
    <style type="text/css">
 - 
 
33 
      #frmForgotPassword .error{
 - 
 
34 
        float:none !important;
 - 
 
35 
        display:block;
 - 
 
36 
        margin-left:-5px;
 - 
 
37 
        width:224px !important;
 - 
 
38 
        color:#f00;
 - 
 
39 
        font-size:11px;
 - 
 
40 
        text-align:left !important;
 - 
 
41 
      }
 - 
 
42 
    </style>
 - 
 
43 
 
 11 
 
44 
 
 - 
 
45 
>>>>>>> .r941
 - 
 
46 
  </head>
 12 
  </head>
47 
  <body>
 13 
  <body>
48 
 
 14 
 
49 
    <noscript>
 15 
    <noscript>
50 
      <p id="noScript">Please allow <em>Javascript</em> in order to function this website correctly!</p>
 16 
      <p id="noScript">Please allow <em>Javascript</em> in order to function this website correctly!</p>
Line 173... Line 139...
173 
 
 139 
 
174 
    <!-- footer -->
 140 
    <!-- footer -->
175 
    $action.getFooterSnippet()
 141 
    $action.getFooterSnippet()
176 
    <!-- /footer -->
 142 
    <!-- /footer -->
177 
 
 143 
 
178 
<<<<<<< .mine
 - 
 
179 
#include ( "templates/commonjsfiles.vm" )
 144 
#include ( "templates/commonjsfiles.vm" )
180 
<script type="text/javascript">
 145 
<script type="text/javascript">
181 
	$(document).ready(function(){
 146 
	$(document).ready(function(){
182 
		$("#frmForgotPassword").validate({
 147 
		$("#frmForgotPassword").validate({
183 
			rules: {
 148 
			rules: {
Line 189... Line 154...
189 
		});
 154 
		});
190 
	});
 155 
	});
191 
</script>
 156 
</script>
192 
 
 157 
 
193 
</body>
 158 
</body>
194 
=======
 - 
 
195 
  </body>
 - 
 
196 
>>>>>>> .r941
 - 
 
197 
</html>
 159 
</html>
198 
 
 160