mensajePequeños retoques en el listado de posts y en el footer
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -31,6 +31,8 @@ capybara-*.html
|
||||
**.orig
|
||||
rerun.txt
|
||||
pickle-email-*.html
|
||||
timeoverflow_development
|
||||
timeoverflow_test
|
||||
|
||||
.env
|
||||
.DS_Store
|
||||
|
||||
239
Gemfile.lock
239
Gemfile.lock
@ -1,8 +1,8 @@
|
||||
GIT
|
||||
remote: git://github.com/activeadmin/activeadmin.git
|
||||
revision: 60914c887942cb34d737428fb9813f69bb8ae3ee
|
||||
revision: 0b4b22871fd332c94daec3c5138c0cf9a5b95451
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
activeadmin (1.0.0.pre1)
|
||||
arbre (~> 1.0, >= 1.0.2)
|
||||
bourbon
|
||||
coffee-rails
|
||||
@ -19,36 +19,36 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activejob (= 4.2.0)
|
||||
actionmailer (4.2.1)
|
||||
actionpack (= 4.2.1)
|
||||
actionview (= 4.2.1)
|
||||
activejob (= 4.2.1)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rack (~> 1.6.0)
|
||||
actionpack (4.2.1)
|
||||
actionview (= 4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
actionview (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
actionview (4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
activejob (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
activejob (4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
activemodel (4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.0)
|
||||
activemodel (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
activerecord (4.2.1)
|
||||
activemodel (= 4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.0)
|
||||
activesupport (4.2.1)
|
||||
i18n (~> 0.7)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
@ -61,7 +61,7 @@ GEM
|
||||
astrolabe (1.3.0)
|
||||
parser (>= 2.2.0.pre.3, < 3.0)
|
||||
awesome_print (1.6.1)
|
||||
bcrypt (3.1.9)
|
||||
bcrypt (3.1.10)
|
||||
better_errors (2.1.1)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
@ -72,7 +72,7 @@ GEM
|
||||
sass (~> 3.2)
|
||||
thor
|
||||
builder (3.2.2)
|
||||
byebug (4.0.5)
|
||||
byebug (5.0.0)
|
||||
columnize (= 0.9.0)
|
||||
capybara (2.4.4)
|
||||
mime-types (>= 1.16)
|
||||
@ -80,22 +80,22 @@ GEM
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
choice (0.1.7)
|
||||
choice (0.2.0)
|
||||
chronic (0.10.2)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.1.0)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.3.0)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.8.0)
|
||||
coffee-script-source (1.9.1.1)
|
||||
columnize (0.9.0)
|
||||
daemons (1.1.9)
|
||||
dalli (2.7.2)
|
||||
database_cleaner (1.4.0)
|
||||
daemons (1.2.2)
|
||||
dalli (2.7.4)
|
||||
database_cleaner (1.4.1)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.4.1)
|
||||
devise (3.5.1)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
@ -105,178 +105,181 @@ GEM
|
||||
devise_browserid_authenticatable (1.3.2)
|
||||
devise (>= 2.1)
|
||||
diff-lcs (1.2.5)
|
||||
dotenv (1.0.2)
|
||||
dotenv-rails (1.0.2)
|
||||
dotenv (= 1.0.2)
|
||||
elasticsearch (1.0.8)
|
||||
elasticsearch-api (= 1.0.7)
|
||||
elasticsearch-transport (= 1.0.7)
|
||||
elasticsearch-api (1.0.7)
|
||||
domain_name (0.5.24)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.0.1)
|
||||
dotenv-rails (2.0.1)
|
||||
dotenv (= 2.0.1)
|
||||
elasticsearch (1.0.12)
|
||||
elasticsearch-api (= 1.0.12)
|
||||
elasticsearch-transport (= 1.0.12)
|
||||
elasticsearch-api (1.0.12)
|
||||
multi_json
|
||||
elasticsearch-model (0.1.7)
|
||||
activesupport (> 3)
|
||||
elasticsearch (> 0.4)
|
||||
hashie
|
||||
elasticsearch-rails (0.1.7)
|
||||
elasticsearch-transport (1.0.7)
|
||||
elasticsearch-transport (1.0.12)
|
||||
faraday
|
||||
multi_json
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.7)
|
||||
execjs (2.2.2)
|
||||
fabrication (2.11.3)
|
||||
execjs (2.5.2)
|
||||
fabrication (2.13.2)
|
||||
faker (1.4.3)
|
||||
i18n (~> 0.5)
|
||||
faraday (0.9.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
foreman (0.77.0)
|
||||
dotenv (~> 1.0.2)
|
||||
foreman (0.78.0)
|
||||
thor (~> 0.19.1)
|
||||
formtastic (3.1.3)
|
||||
actionpack (>= 3.2.13)
|
||||
formtastic_i18n (0.1.1)
|
||||
globalid (0.3.0)
|
||||
formtastic_i18n (0.4.1)
|
||||
globalid (0.3.5)
|
||||
activesupport (>= 4.1.0)
|
||||
haml (4.1.0.beta.1)
|
||||
haml (4.0.6)
|
||||
tilt
|
||||
haml-lint (0.10.0)
|
||||
haml-lint (0.13.0)
|
||||
haml (~> 4.0)
|
||||
rubocop (>= 0.25.0)
|
||||
sysexits (~> 1.1)
|
||||
haml-rails (0.6.0)
|
||||
haml-rails (0.9.0)
|
||||
actionpack (>= 4.0.1)
|
||||
activesupport (>= 4.0.1)
|
||||
haml (>= 3.1, < 5.0)
|
||||
haml (>= 4.0.6, < 5.0)
|
||||
html2haml (>= 1.0.1)
|
||||
railties (>= 4.0.1)
|
||||
has_scope (0.6.0)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
hashie (3.4.1)
|
||||
hashie (3.4.2)
|
||||
high_voltage (2.1.0)
|
||||
hike (1.2.3)
|
||||
hpricot (0.8.6)
|
||||
hstore_translate (1.0.0)
|
||||
activerecord (>= 3.1.0)
|
||||
html2haml (1.0.1)
|
||||
html2haml (2.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
haml (>= 4.0.0.rc.1)
|
||||
hpricot (~> 0.8.6)
|
||||
ruby_parser (~> 3.1.1)
|
||||
http_accept_language (2.0.2)
|
||||
haml (~> 4.0.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
ruby_parser (~> 3.5)
|
||||
http-cookie (1.0.2)
|
||||
domain_name (~> 0.5)
|
||||
http_accept_language (2.0.5)
|
||||
i18n (0.7.0)
|
||||
inherited_resources (1.6.0)
|
||||
actionpack (>= 3.2, < 5)
|
||||
has_scope (~> 0.6.0.rc)
|
||||
railties (>= 3.2, < 5)
|
||||
responders
|
||||
jbuilder (2.2.6)
|
||||
jbuilder (2.2.16)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (4.0.3)
|
||||
rails-dom-testing (~> 1.0)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.3)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.2)
|
||||
kaminari (0.16.1)
|
||||
json (1.8.3)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
loofah (2.0.1)
|
||||
loofah (2.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
memcachier (0.0.2)
|
||||
mime-types (2.4.3)
|
||||
mime-types (2.6.1)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.5.1)
|
||||
multi_json (1.10.1)
|
||||
minitest (5.7.0)
|
||||
multi_json (1.11.0)
|
||||
multipart-post (2.0.0)
|
||||
netrc (0.10.2)
|
||||
ngannotate-rails (0.14.1)
|
||||
netrc (0.10.3)
|
||||
ngannotate-rails (1.0.2)
|
||||
execjs
|
||||
rails (>= 3.1)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
orm_adapter (0.5.0)
|
||||
paranoia (2.0.4)
|
||||
paranoia (2.1.2)
|
||||
activerecord (~> 4.0)
|
||||
parser (2.2.0.2)
|
||||
parser (2.2.2.5)
|
||||
ast (>= 1.1, < 3.0)
|
||||
pdf-core (0.5.1)
|
||||
pg (0.17.1)
|
||||
polyamorous (1.1.0)
|
||||
polyamorous (1.2.0)
|
||||
activerecord (>= 3.0)
|
||||
powerpack (0.0.9)
|
||||
powerpack (0.1.1)
|
||||
prawn (2.0.1)
|
||||
pdf-core (~> 0.5.1)
|
||||
ttfunk (~> 1.4.0)
|
||||
prawn-table (0.2.1)
|
||||
pundit (0.3.0)
|
||||
pundit (1.0.1)
|
||||
activesupport (>= 3.0.0)
|
||||
rack (1.6.0)
|
||||
rack (1.6.1)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.0)
|
||||
actionmailer (= 4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
actionview (= 4.2.0)
|
||||
activejob (= 4.2.0)
|
||||
activemodel (= 4.2.0)
|
||||
activerecord (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
rails (4.2.1)
|
||||
actionmailer (= 4.2.1)
|
||||
actionpack (= 4.2.1)
|
||||
actionview (= 4.2.1)
|
||||
activejob (= 4.2.1)
|
||||
activemodel (= 4.2.1)
|
||||
activerecord (= 4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.0)
|
||||
railties (= 4.2.1)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.5)
|
||||
rails-dom-testing (1.0.6)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-erd (1.1.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
choice (~> 0.1.6)
|
||||
ruby-graphviz (~> 1.0.4)
|
||||
rails-html-sanitizer (1.0.1)
|
||||
rails-erd (1.4.0)
|
||||
activerecord (>= 3.2)
|
||||
activesupport (>= 3.2)
|
||||
choice (~> 0.2.0)
|
||||
ruby-graphviz (~> 1.2)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
loofah (~> 2.0)
|
||||
rails-i18n (4.0.3)
|
||||
rails-i18n (4.0.4)
|
||||
i18n (~> 0.6)
|
||||
railties (~> 4.0)
|
||||
rails_12factor (0.0.3)
|
||||
rails_serve_static_assets
|
||||
rails_stdout_logging
|
||||
rails_serve_static_assets (0.0.3)
|
||||
rails_serve_static_assets (0.0.4)
|
||||
rails_stdout_logging (0.0.3)
|
||||
railties (4.2.0)
|
||||
actionpack (= 4.2.0)
|
||||
activesupport (= 4.2.0)
|
||||
railties (4.2.1)
|
||||
actionpack (= 4.2.1)
|
||||
activesupport (= 4.2.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
rake (10.4.2)
|
||||
ransack (1.6.3)
|
||||
ransack (1.6.6)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
i18n
|
||||
polyamorous (~> 1.1)
|
||||
rdiscount (2.1.7.1)
|
||||
responders (2.0.2)
|
||||
railties (>= 4.2.0.alpha, < 5)
|
||||
rest-client (1.7.2)
|
||||
polyamorous (~> 1.2)
|
||||
rdiscount (2.1.8)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
rest-client (1.8.0)
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
rollbar (1.3.2)
|
||||
rollbar (1.5.3)
|
||||
multi_json (~> 1.3)
|
||||
rspec-collection_matchers (1.1.2)
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (2.99.2)
|
||||
rspec-expectations (2.99.2)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.99.2)
|
||||
rspec-mocks (2.99.3)
|
||||
rspec-rails (2.99.0)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
@ -286,15 +289,15 @@ GEM
|
||||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
rubocop (0.28.0)
|
||||
rubocop (0.32.0)
|
||||
astrolabe (~> 1.3)
|
||||
parser (>= 2.2.0.pre.7, < 3.0)
|
||||
powerpack (~> 0.0.6)
|
||||
parser (>= 2.2.2.5, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
ruby-graphviz (1.0.9)
|
||||
ruby-progressbar (1.7.1)
|
||||
ruby_parser (3.1.3)
|
||||
ruby-graphviz (1.2.2)
|
||||
ruby-progressbar (1.7.5)
|
||||
ruby_parser (3.7.0)
|
||||
sexp_processor (~> 4.1)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.5)
|
||||
@ -302,8 +305,8 @@ GEM
|
||||
sass (~> 3.2.2)
|
||||
sprockets (~> 2.8, < 3.0)
|
||||
sprockets-rails (~> 2.0)
|
||||
sexp_processor (4.4.4)
|
||||
shelly-dependencies (0.2.4)
|
||||
sexp_processor (4.6.0)
|
||||
shelly-dependencies (0.2.5)
|
||||
rake
|
||||
thin
|
||||
shoulda (3.5.0)
|
||||
@ -315,7 +318,7 @@ GEM
|
||||
simple_form (3.1.0)
|
||||
actionpack (~> 4.0)
|
||||
activemodel (~> 4.0)
|
||||
slim (3.0.3)
|
||||
slim (3.0.6)
|
||||
temple (~> 0.7.3)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slim-rails (3.0.1)
|
||||
@ -329,18 +332,18 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.2.2)
|
||||
sprockets-rails (2.3.1)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sysexits (1.2.0)
|
||||
temple (0.7.5)
|
||||
temple (0.7.6)
|
||||
thin (1.6.3)
|
||||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.4)
|
||||
thread_safe (0.3.5)
|
||||
tilt (1.4.1)
|
||||
travis-lint (2.0.0)
|
||||
json
|
||||
@ -349,15 +352,18 @@ GEM
|
||||
coffee-rails
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.0)
|
||||
uglifier (2.7.1)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.1)
|
||||
warden (1.2.3)
|
||||
rack (>= 1.0)
|
||||
web-console (2.0.0)
|
||||
activemodel (~> 4.0)
|
||||
web-console (2.1.2)
|
||||
activemodel (>= 4.0)
|
||||
binding_of_caller (>= 0.7.2)
|
||||
railties (~> 4.0)
|
||||
railties (>= 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
whenever (0.9.4)
|
||||
chronic (>= 0.6.3)
|
||||
@ -422,3 +428,6 @@ DEPENDENCIES
|
||||
uglifier (>= 1.0.3)
|
||||
web-console (~> 2.0)
|
||||
whenever
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.3
|
||||
|
||||
@ -26,16 +26,22 @@ body[data-action="devise/sessions-new"], body[data-action="devise/sessions-creat
|
||||
|
||||
|
||||
.post {
|
||||
border-top: solid black 1px;
|
||||
border-radius: 10px;
|
||||
margin: 20px 10px;
|
||||
padding: 5px 20px;
|
||||
background-color: #fbfbfb;
|
||||
list-style: none;
|
||||
h3 small span.offerer:not(:last-of-type):after {
|
||||
content: ",";
|
||||
}
|
||||
}
|
||||
.offers {
|
||||
h4 {
|
||||
font-weight: bold;
|
||||
margin-top: 20px;
|
||||
display: block;
|
||||
}
|
||||
.glyphicon-folder-open{
|
||||
font-size: 140%;
|
||||
margin: 0 5px;
|
||||
}
|
||||
.category{
|
||||
margin-right: 10px;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,7 +50,22 @@ body[data-action="devise/sessions-new"], body[data-action="devise/sessions-creat
|
||||
}
|
||||
|
||||
#footer {
|
||||
font-size: 10px;
|
||||
height: 20px;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
background-color: #080808;
|
||||
vertical-align: middle;
|
||||
line-height: 20px;
|
||||
p {
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
font-size: 10px;
|
||||
a{
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.row.exports {
|
||||
@ -52,8 +73,12 @@ body[data-action="devise/sessions-new"], body[data-action="devise/sessions-creat
|
||||
}
|
||||
|
||||
@media screen {
|
||||
body {
|
||||
// padding-top: 60px;
|
||||
html {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
}
|
||||
body{
|
||||
margin: 0 0 20px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -78,20 +103,6 @@ body[data-action="devise/sessions-new"], body[data-action="devise/sessions-creat
|
||||
|
||||
}
|
||||
|
||||
body {
|
||||
// padding-top: 60px;
|
||||
padding-bottom: 40px;
|
||||
// background-image: image-url('light_wool.png');
|
||||
}
|
||||
nav.navbar-static-top.navbar-inverse {
|
||||
// background-image: image-url('denim.png');
|
||||
// height: 40px;
|
||||
// color: white;
|
||||
}
|
||||
.container-inner{
|
||||
// background-image: image-url('furley_bg.png');
|
||||
// padding: 0 20px;
|
||||
}
|
||||
|
||||
.error {
|
||||
color: red;
|
||||
@ -111,6 +122,11 @@ ul.statistics li{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
.more{
|
||||
margin: 10px auto;
|
||||
display: block;
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
/*flash*/
|
||||
.alert-error {
|
||||
|
||||
@ -47,11 +47,16 @@
|
||||
= render 'layouts/messages'
|
||||
= yield
|
||||
|
||||
|
||||
.row#footer
|
||||
%a{href: tnc_path, "data-toggle" => "modal", "data-target" => "#modal"}
|
||||
= t("application.terms_conditions")
|
||||
|
||||
.modal.fade#modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
|
||||
#footer
|
||||
%p
|
||||
%a{href: tnc_path, "data-toggle" => "modal", "data-target" => "#modal"}
|
||||
= t("application.terms_conditions")
|
||||
|
|
||||
%a
|
||||
= link_to page_path("about") do
|
||||
= t "layouts.application.about"
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
- @offers.each do |cat, offs|
|
||||
.offers
|
||||
%h4=cat.name.capitalize
|
||||
%h3=cat.name.capitalize
|
||||
= render :partial => 'shared/posts', :locals => { :posts => offs }
|
||||
|
||||
= link_to t('.more'), offers_path(cat: cat.id)
|
||||
= link_to t('.more'), offers_path(cat: cat.id), :class=>"more btn btn-primary"
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
- posts.each do |post|
|
||||
.post
|
||||
%h5
|
||||
%h4
|
||||
= link_to post do
|
||||
= post.title
|
||||
%span.glyphicon.glyphicon-expand
|
||||
%p= post.description
|
||||
%p
|
||||
%small
|
||||
- if post.category
|
||||
%span.glyphicon.glyphicon-folder-open
|
||||
- path = get_index_path(post,cat: post.category)
|
||||
=link_to path do
|
||||
= post.category
|
||||
%span.category
|
||||
- path = get_index_path(post,cat: post.category)
|
||||
=link_to path do
|
||||
= post.category
|
||||
- (post.tags || []).each do |tag|
|
||||
%span.glyphicon.glyphicon-tag
|
||||
- path = get_index_path(post,tag: tag)
|
||||
=link_to path do
|
||||
= tag
|
||||
%p= post.description
|
||||
|
||||
96
db/schema.rb
96
db/schema.rb
@ -20,8 +20,8 @@ ActiveRecord::Schema.define(version: 20150422162806) do
|
||||
|
||||
create_table "accounts", force: :cascade do |t|
|
||||
t.integer "accountable_id"
|
||||
t.string "accountable_type", limit: 255
|
||||
t.integer "balance"
|
||||
t.string "accountable_type"
|
||||
t.integer "balance", default: 0
|
||||
t.integer "max_allowed_balance"
|
||||
t.integer "min_allowed_balance"
|
||||
t.boolean "flagged"
|
||||
@ -30,16 +30,16 @@ ActiveRecord::Schema.define(version: 20150422162806) do
|
||||
t.integer "organization_id"
|
||||
end
|
||||
|
||||
add_index "accounts", ["accountable_id", "accountable_type"], name: "index_accounts_on_accountable_id_and_accountable_type", using: :btree
|
||||
add_index "accounts", ["accountable_type", "accountable_id"], name: "index_accounts_on_accountable_type_and_accountable_id", using: :btree
|
||||
add_index "accounts", ["organization_id"], name: "index_accounts_on_organization_id", using: :btree
|
||||
|
||||
create_table "active_admin_comments", force: :cascade do |t|
|
||||
t.string "namespace", limit: 255
|
||||
t.string "namespace"
|
||||
t.text "body"
|
||||
t.string "resource_id", limit: 255, null: false
|
||||
t.string "resource_type", limit: 255, null: false
|
||||
t.string "resource_id", null: false
|
||||
t.string "resource_type", null: false
|
||||
t.integer "author_id"
|
||||
t.string "author_type", limit: 255
|
||||
t.string "author_type"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
end
|
||||
@ -49,17 +49,17 @@ ActiveRecord::Schema.define(version: 20150422162806) do
|
||||
add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id", using: :btree
|
||||
|
||||
create_table "categories", force: :cascade do |t|
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.hstore "name_translations"
|
||||
end
|
||||
|
||||
create_table "documents", force: :cascade do |t|
|
||||
t.integer "documentable_id"
|
||||
t.string "documentable_type", limit: 255
|
||||
t.string "documentable_type"
|
||||
t.text "title"
|
||||
t.text "content"
|
||||
t.string "label", limit: 255
|
||||
t.string "label"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
end
|
||||
@ -93,25 +93,25 @@ ActiveRecord::Schema.define(version: 20150422162806) do
|
||||
add_index "movements", ["transfer_id"], name: "index_movements_on_transfer_id", using: :btree
|
||||
|
||||
create_table "organizations", force: :cascade do |t|
|
||||
t.string "name", limit: 255
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.string "name"
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.integer "reg_number_seq"
|
||||
t.string "theme", limit: 255
|
||||
t.string "email", limit: 255
|
||||
t.string "phone", limit: 255
|
||||
t.string "web", limit: 255
|
||||
t.string "theme"
|
||||
t.string "email"
|
||||
t.string "phone"
|
||||
t.string "web"
|
||||
t.text "public_opening_times"
|
||||
t.text "description"
|
||||
t.text "address"
|
||||
t.string "neighborhood", limit: 255
|
||||
t.string "city", limit: 255
|
||||
t.string "domain", limit: 255
|
||||
t.string "neighborhood"
|
||||
t.string "city"
|
||||
t.string "domain"
|
||||
end
|
||||
|
||||
create_table "posts", force: :cascade do |t|
|
||||
t.string "title", limit: 255
|
||||
t.string "type", limit: 255
|
||||
t.string "title"
|
||||
t.string "type"
|
||||
t.integer "category_id"
|
||||
t.integer "user_id"
|
||||
t.text "description"
|
||||
@ -120,12 +120,12 @@ ActiveRecord::Schema.define(version: 20150422162806) do
|
||||
t.boolean "permanent"
|
||||
t.boolean "joinable"
|
||||
t.boolean "global"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.text "tags", array: true
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.text "tags", array: true
|
||||
t.integer "publisher_id"
|
||||
t.integer "organization_id"
|
||||
t.boolean "active", default: true
|
||||
t.boolean "active", default: true
|
||||
end
|
||||
|
||||
add_index "posts", ["category_id"], name: "index_posts_on_category_id", using: :btree
|
||||
@ -151,39 +151,39 @@ ActiveRecord::Schema.define(version: 20150422162806) do
|
||||
end
|
||||
|
||||
create_table "users", force: :cascade do |t|
|
||||
t.string "username", limit: 255, null: false
|
||||
t.string "email", limit: 255, null: false
|
||||
t.string "password_digest", limit: 255
|
||||
t.string "username", null: false
|
||||
t.string "email", null: false
|
||||
t.string "password_digest"
|
||||
t.date "date_of_birth"
|
||||
t.string "identity_document", limit: 255
|
||||
t.string "phone", limit: 255
|
||||
t.string "alt_phone", limit: 255
|
||||
t.string "identity_document"
|
||||
t.string "phone"
|
||||
t.string "alt_phone"
|
||||
t.text "address"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.datetime "deleted_at"
|
||||
t.string "gender", limit: 255
|
||||
t.string "gender"
|
||||
t.text "description"
|
||||
t.boolean "active", default: true
|
||||
t.datetime "terms_accepted_at"
|
||||
t.string "encrypted_password", limit: 255, default: "", null: false
|
||||
t.string "reset_password_token", limit: 255
|
||||
t.string "encrypted_password", default: "", null: false
|
||||
t.string "reset_password_token"
|
||||
t.datetime "reset_password_sent_at"
|
||||
t.datetime "remember_created_at"
|
||||
t.integer "sign_in_count", default: 0
|
||||
t.integer "sign_in_count", default: 0
|
||||
t.datetime "current_sign_in_at"
|
||||
t.datetime "last_sign_in_at"
|
||||
t.string "current_sign_in_ip", limit: 255
|
||||
t.string "last_sign_in_ip", limit: 255
|
||||
t.string "confirmation_token", limit: 255
|
||||
t.string "current_sign_in_ip"
|
||||
t.string "last_sign_in_ip"
|
||||
t.string "confirmation_token"
|
||||
t.datetime "confirmed_at"
|
||||
t.datetime "confirmation_sent_at"
|
||||
t.string "unconfirmed_email", limit: 255
|
||||
t.integer "failed_attempts", default: 0
|
||||
t.string "unlock_token", limit: 255
|
||||
t.string "unconfirmed_email"
|
||||
t.integer "failed_attempts", default: 0
|
||||
t.string "unlock_token"
|
||||
t.datetime "locked_at"
|
||||
t.boolean "active", default: true
|
||||
t.string "locale", default: "es"
|
||||
t.boolean "notifications", default: true
|
||||
t.string "locale", default: "es"
|
||||
t.boolean "notifications", default: true
|
||||
end
|
||||
|
||||
add_index "users", ["email"], name: "index_users_on_email", using: :btree
|
||||
|
||||
Reference in New Issue
Block a user