1. Rafał Kos
  2. Home budget

Commits

Rafał Kos  committed 6b269da

Changes in login template and forgot_password, changed font in main menu

  • Participants
  • Parent commits 4eb8b82
  • Branches default

Comments (0)

Files changed (5)

File homebudget/public/css/layout.css

View file
 	font-weight: bold;
 	line-height: 37px;
 	text-decoration: none;
-	color: #646464;
+	color: #000;
 	padding: 0 20px;
+    text-shadow:0 1px 0 rgba(255, 255, 255, 0.8);
 }
 
 #mainNav li.logout {
 
 #sidebar .sideNav li a {
 	display: block;
-	color: #646464;
+	color: #000;
 	background: #f6f6f6;
 	text-decoration: none;
 	height: 29px;
 	line-height: 29px;
 	padding: 0 19px;
 	width: 141px;
+    text-shadow:0 1px 0 rgba(255, 255, 255, 0.8);
 }
 
 #sidebar .sideNav li a:hover { background: #fdfcf6; }

File homebudget/public/js/scripts.js

View file
 }
 
 $(document).ready(function() {
-    $("button, input:submit, .checkbox").button();
+    $("button, input:submit").button();
     $(".radio").buttonset();
 
     $('.date-picker').datepicker({

File homebudget/templates/base/forgot_password.html

View file
     {% endblock %}
 
     {{ h.stylesheet_link(url('/css/reset.css'),
-                         url('/css/login.css')) }}
+                         url('/css/login.css'),
+                         url('/css/jquery-ui-1.8.2.custom.css')) }}
+
+    {{ h.javascript_link(url('/js/jquery.js'),
+                         url('/js/jquery-ui-1.8.2.custom.min.js'),
+                         url('/js/scripts.js')) }}
 
 </head>
 <body>

File homebudget/templates/base/login.html

View file
     {% endblock %}
 
     {{ h.stylesheet_link(url('/css/reset.css'),
-                         url('/css/login.css')) }}
+                         url('/css/login.css'),
+                         url('/css/jquery-ui-1.8.2.custom.css')) }}
+
+    {{ h.javascript_link(url('/js/jquery.js'),
+                         url('/js/jquery-ui-1.8.2.custom.min.js'),
+                         url('/js/scripts.js')) }}
 
 </head>
 <body>
                             A password will be emailed to you
                         </p>
                         <p>
-                            <input type="submit" value="{{ _('Register') }}" />                            
+                            {{ h.button('submit', 'submit', _('Register')) }}
                         </p>
                     {{ h.end_form() }}
                 </td>
                         </label>
                         </p>
                         <p>
-                            <input type="submit" value="{{ _('Proceed') }}" />
+                            {{ h.button('submit', 'submit', _('Proceed')) }}
                             {{ h.link_to(_('Forgot password?'), h.url(controller='authorization', action='forgot_password'), style='float: right; padding-top: 6px;') }}
                         </p>
                     {{ h.end_form() }}                   

File homebudget/templates/base/main.html

View file
 
 {%  block scripts %}
 <script type='text/javascript'>
-    $(document).ready(function() {
-        $("button, input:submit").button();
+    $(document).ready(function() {        
 
         var editDialogOptions = {
+            title: '{{ _('Edit payment') }}',
             buttons: {
                 '{{ _('Save') }}': function() {
                     //Block dialog
         };
 
         var newDialogOptions = {
+            title: '{{ _('New payment') }}',
             buttons: {
                 '{{ _('Save') }}': function() {
                     //Block dialog
                     function() {
                         //Set day date
                         $('#date').val($.fullCalendar.formatDate(date, 'yyyy-MM-dd'));
-
-                        $(this).dialog('option', 'title', '{{ _('New payment') }}');
+                                                
                         $(this).dialog('option', newDialogOptions);
                         $(this).dialog('open');
 
                 $('#dialog-form').load('{{ h.url(controller='payments', action='edit_partial') }}/' + calEvent.id,
                     function() {
                         $('#task-id').val(calEvent.id);
-                        $(this).dialog('option', 'title', '{{ _('Edit payment') }}');
                         $(this).dialog('option', editDialogOptions);
                         $(this).dialog('open');
                         $('#loading').hide();