Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into i18n

  • Loading branch information...
commit 76e6043d6708609075e4aeb5a2adab52c534c97f 2 parents 69550cd + 584b8f1
Ramón Martínez Olvera authored
View
2  .gitignore
@@ -77,6 +77,8 @@ app/assets/javascripts/place.js
app/assets/javascripts/supported_browsers.js
app/assets/javascripts/session.js
app/assets/javascripts/document_publication.js
+app/assets/javascripts/document_academic.js
+app/assets/javascripts/document_website.js
app/sass/.sass-cache/
.sass-cache/
public/assets/
View
27 app/assets/javascripts/document_academic.js
@@ -1,27 +0,0 @@
-/* DO NOT MODIFY. This file was compiled Tue, 13 Dec 2011 19:56:19 GMT from
- * /Users/alex/Projects/Rails/salva/app/coffeescripts/document_academic.coffee
- */
-
-
- $(document).ready(function() {
- $(".approve_document").live("click", function(e) {
- var html;
- e.preventDefault();
- html = $.response_from_remote_resource(this.href);
- $(this).parent().parent().replaceWith(html);
- return false;
- });
- $(".reject_document").live("click", function(e) {
- e.preventDefault();
- return $.dialog_for_new_record(this.href);
- });
- return $(".simple_form").live("submit", function() {
- var dom_id;
- dom_id = $(".simple_form").attr("id");
- return $(".simple_form").ajaxComplete(function(event, request, settings) {
- $("#dialog").empty();
- $("#dialog").dialog("close");
- return $("#" + dom_id).replaceWith(request.responseText);
- });
- });
- });
View
5 app/assets/javascripts/web_site.js
@@ -0,0 +1,5 @@
+//= require application
+//= require chosen.jquery.min
+//= require base
+//= require collection
+//= require document_website
View
1  app/coffeescripts/base.coffee
@@ -45,6 +45,7 @@ jQuery.extend
$("#collection_records").remove()
$("#collection_footer").remove()
$(".pagination").remove()
+ $("#pagination_info").remove()
$("#collection_header").after html
false
View
2  app/coffeescripts/document_website.coffee
@@ -0,0 +1,2 @@
+$(document).ready ->
+ $(".chosen-select").chosen()
View
6 app/sass/collection_list.sass
@@ -62,6 +62,12 @@
text-align: center
margin-botom: 5px
+#pagination_info
+ @extend .span-17
+ @extend .last
+ text-align: center
+ margin-botom: 5px
+
.ui-progressbar-value
background-image: url(pbar-ani.gif)
View
197 app/sass/web_site.sass
@@ -1,10 +1,199 @@
@import "base"
+@import "blueprint"
+@import "start-jquery-ui"
@import "form"
-@import "collection_list"
+@import "chosen"
+#session_info
+ @extend .ui-button-set
+ @extend .span-24
+ @extend .last
+ text-align: right
+ .current_user
+ color: green
+ display: inline
+
+#top-navigation
+ @extend .span-24
+ @extend .last
+ font-size: 14px
+ text-align: left
+ height: 30px
+ margin-top: 10px
+ //border: 1px solid red
+ ul
+ @extend .ui-tabs-nav
+ @extend .ui-helper-reset
+ @extend .ui-helper-clearfix
+ @extend .span-24
+ display: inline-block
+ margin-left: -4px
+ vertical-align: middle
+ li
+ @extend .ui-state-default
+ @extend .ui-corner-all
+ list-style-type: none
+ padding-top: 7px
+ padding-left: 3px
+ padding-right: 3px
+ margin-left: 2px
+ background: #0088BB
+ line-height: 1.01em
+ height: 30px
+ width: 200px
+ float: left
+ text-align: center
+ vertical-align: middle
+ a
+ display: inline-block
+ vertical-align: middle
+
+ li.selected
+ @extend .ui-tabs-selected
+ @extend .ui-state-active
+ border-right: 0px
+ margin-top: 0px
+ li:hover
+ @extend .ui-state-hover
+
+#content
+ @extend .span-24
+ @extend .last
+ background: #fff
+ font-size: 11px
+ margin-top: 10px
+ margin-left: -3px
+ margin-bottom: 20px
+ padding-top: 20px
+ text-align: left
h3
- text-shadow: rgb(247, 253, 250) 1px 1px 3px
+ color: #6EAC2C
+ text-shadow: rgb(143,191,92) 1px 1px 3px
font-size: 160%
+
+.row
+ @extend .span-24
+ @extend .last
+ .wrapper
+ @extend .span-5
+ strong
+ font: 14px Arial,sans-serif
+ font-weight: bold
+ text-align: justify
+ color: rgb(0, 136, 187)
+
+ .new_record
+ vertical-align: middle
+ margin-top: 20px
+ margin-left: 3px
+ @extend .ui-state-default
+
+
+.wrapper
+ strong
+ font: 14px Arial,sans-serif
+ font-weight: bold
+ text-align: justify
+ color: rgb(0, 136, 187)
+
+.record
+ padding-top: 8px
+ padding-bottom: 8px
+ min-height: 60px
+ border-bottom: 1px solid silver
+ vertical-align: middle
+
+.record-odd
+ @extend .record
+ background-color: #fff
+ color: #585858
+
+.record-odd:hover
+ background-color: #CEF6CE
+
+.record-even
+ @extend .record
+ background: #EFF5FB
+ color: #585858
+
+.record-even:hover
+ background-color: #CEF6CE
+
+#paginator
+ display: block
+ height: 30px
+
+.pagination
+ @extend .span-24
+ @extend .last
+ text-align: center
+ margin-botom: 5px
+
+#pagination_info
+ @extend .span-24
+ @extend .last
+ text-align: center
+ margin-botom: 5px
+
+.ui-progressbar-value
+ background-image: url(pbar-ani.gif)
+
+
+.collection_header_colors
+ background: #f5f5f5
+ color: #0088bb
font-weight: bold
- color: #00688F
- letter-spacing: -1px
+ padding-left: 3px
+
+
+#filter_form
+ @extend .ui-widget-header
+ @extend .ui-helper-clearfix
+ @extend .span-24
+ @extend .last
+ @extend .collection_header_colors
+ border-color: silver
+ padding-bottom: 5px
+ ul
+ color: #585858
+ .chzn-single
+ color: #585858
+
+#collection_header
+ @extend .ui-widget-header
+ @extend .ui-helper-clearfix
+ @extend .span-24
+ @extend .last
+ @extend .collection_header_colors
+ border-style: solid
+ border-color: silver
+ background: #f5f5f5
+ .action
+ @extend .span-2
+ text-align: center
+
+#collection_records
+ @extend .span-24
+ @extend .last
+ border-left: 1px solid silver
+ border-right: 1px solid silver
+ text-align: left
+ padding-left: 3px
+ min-height: 60px
+
+#collection_footer
+ @extend .ui-widget-header
+ @extend .ui-helper-clearfix
+ @extend .span-24
+ @extend .last
+ @extend .collection_header_colors
+ border-top: 0px
+ text-align: right
+ padding: 5px 0px 5px 0px
+ margin-bottom: 10px
+ padding-left: 3px
+ border-top: 0px
+ border-left: 1px solid silver
+ border-right: 1px solid silver
+ border-bottom: 1px solid silver
+
View
4 app/views/layouts/web_site.html.haml
@@ -4,8 +4,8 @@
%title= 'Plataforma de Información Curricular - SALVA'
= csrf_meta_tag
= render :partial => 'layouts/blueprint_css'
- = stylesheet_link_tag 'academic'
- = javascript_include_tag 'academic'
+ = stylesheet_link_tag 'web_site'
+ = javascript_include_tag 'web_site'
%body
= render :partial => 'layouts/header'
View
4 app/views/web_site/annual_plans/_record.html.haml
@@ -2,8 +2,8 @@
.span-4= record.user.fullname_or_email
.span-4= record.approved_by.nil? ? "-" : record.approved_by.fullname_or_email
.span-4= record.documenttype.name
- .span-4= record.created_on.to_s(:format => :short)
- .span-4= record.updated_on.to_s(:format => :short)
+ .span-4= record.created_on.to_s(:long)
+ .span-4= record.updated_on.to_s(:long)
.span-2= document_status_indicator(record.approved)
.span-2.last= link_to_download(record)
View
11 app/views/web_site/annual_plans/_search_form.html.haml
@@ -0,0 +1,11 @@
+= form_for :search, :remote => true, :html => {:id => "filter_form"} do |f|
+ .span-2=t(:fullname)
+ .span-6= f.text_field :fullname_like, :size => 30
+ .span-2=t(:adscription)
+ .span-6= f.collection_select :adscription_id_eq, Adscription.all, :id, :name, {:prompt => true}, :class => 'chosen-select'
+ .span-2=t(:year)
+ .span-6.last= f.collection_select :documenttype_id_eq, Documenttype.annual_plans.all, :id, :year, {:prompt => true}, :class => 'chosen-select'
+
+ .span-5.prepend-19.last
+ .search_button= link_to t(:search), "#", :id => "search_button"
+ .reset_search_button.last= link_to "Listar todos", "#" , :id => 'reset_search_button'
View
3  app/views/web_site/annual_plans/index.html.haml
@@ -1,5 +1,7 @@
%h3= t('.title')
+= render :partial => 'search_form'
+
#collection_header
.span-4=t(:fullname)
.span-4=t(:academic_responsible)
@@ -16,3 +18,4 @@
= will_paginate(@documents)
+#pagination_info= page_entries_info @documents
View
8 app/views/web_site/annual_plans/index.js.haml
@@ -0,0 +1,8 @@
+#collection_records
+ = render :partial => 'record', :collection => @documents
+
+#collection_footer
+
+= will_paginate @documents, :id => 'ajaxed_paginator'
+
+#pagination_info= page_entries_info @documents
View
4 app/views/web_site/annual_reports/_record.html.haml
@@ -2,8 +2,8 @@
.span-4= record.user.fullname_or_email
.span-4= record.approved_by.nil? ? "-" : record.approved_by.fullname_or_email
.span-4= record.documenttype.name
- .span-4= record.created_on.to_s(:format => :short)
- .span-4= record.updated_on.to_s(:format => :short)
+ .span-4= record.created_on.to_s(:long)
+ .span-4= record.updated_on.to_s(:long)
.span-2= document_status_indicator(record.approved)
.span-2.last= link_to_download(record)
View
11 app/views/web_site/annual_reports/_search_form.html.haml
@@ -0,0 +1,11 @@
+= form_for :search, :remote => true, :html => {:id => "filter_form"} do |f|
+ .span-2=t(:fullname)
+ .span-6= f.text_field :fullname_like, :size => 30
+ .span-2=t(:adscription)
+ .span-6= f.collection_select :adscription_id_eq, Adscription.all, :id, :name, {:prompt => true}, :class => 'chosen-select'
+ .span-2=t(:year)
+ .span-6.last= f.collection_select :documenttype_id_eq, Documenttype.annual_reports.all, :id, :year, {:prompt => true}, :class => 'chosen-select'
+
+ .span-5.prepend-19.last
+ .search_button= link_to t(:search), "#", :id => "search_button"
+ .reset_search_button.last= link_to "Listar todos", "#" , :id => 'reset_search_button'
View
3  app/views/web_site/annual_reports/index.html.haml
@@ -1,5 +1,7 @@
%h3= t('.title')
+= render :partial => 'search_form'
+
#collection_header
.span-4=t(:fullname)
.span-4=t(:academic_responsible)
@@ -16,3 +18,4 @@
= will_paginate(@documents)
+#pagination_info= page_entries_info @documents
View
8 app/views/web_site/annual_reports/index.js.haml
@@ -0,0 +1,8 @@
+#collection_records
+ = render :partial => 'record', :collection => @documents
+
+#collection_footer
+
+= will_paginate @documents, :id => 'ajaxed_paginator'
+
+#pagination_info= page_entries_info @documents
View
2  config/environments/production.rb
@@ -51,7 +51,7 @@
# config.assets.precompile += %w( search.js )
config.assets.precompile += %w( screen.css print.css ie.css devise.css devise.js user_resources.css
user_resources.js publications.css publications.js academic.css
- academic.js)
+ academic.js web_site.css web_site.js)
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
Please sign in to comment.
Something went wrong with that request. Please try again.