summaryrefslogtreecommitdiff
path: root/core/app/views
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-05-16 08:42:36 +0200
committerAzul <azul@leap.se>2014-05-16 08:42:36 +0200
commit8fbbb8717f0578536b97c2dc0883c632f120e976 (patch)
tree17aeb2b48ada703ac916a9a65fbf3c75a5dadb86 /core/app/views
parent81555ec6244ed76f92e3629880f68104b8705817 (diff)
parenta4f7a410c536d88c91c834cab6ee950c71005ddd (diff)
Merge remote-tracking branch 'origin/develop'
Conflicts: app/assets/javascripts/srp test/nagios/soledad_sync.py test/nagios/webapp_login.py
Diffstat (limited to 'core/app/views')
-rw-r--r--core/app/views/common/_download_for_os.html.haml17
-rw-r--r--core/app/views/common/_home_page_buttons.html.haml23
-rw-r--r--core/app/views/kaminari/_first_page.html.haml9
-rw-r--r--core/app/views/kaminari/_gap.html.haml8
-rw-r--r--core/app/views/kaminari/_last_page.html.haml9
-rw-r--r--core/app/views/kaminari/_next_page.html.haml12
-rw-r--r--core/app/views/kaminari/_page.html.haml14
-rw-r--r--core/app/views/kaminari/_paginator.html.haml19
-rw-r--r--core/app/views/kaminari/_prev_page.html.haml12
9 files changed, 0 insertions, 123 deletions
diff --git a/core/app/views/common/_download_for_os.html.haml b/core/app/views/common/_download_for_os.html.haml
deleted file mode 100644
index 3a11d10..0000000
--- a/core/app/views/common/_download_for_os.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- os = download_for_os
-%div{:class => "os-#{os}"}
- %span.link
- - btn_class = (os == "other") ? "disabled" : "btn-primary"
- = link_to client_download_url(os), :class => "btn btn-large #{btn_class}" do
- = big_icon('download')
- .pull-right
- = t(:download_client)
- %br/
- %small= I18n.t("os.#{os}")
- %span.info
- %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
- %div
- - if os == "other"
- = t(:all_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe
- - else
- = t(:other_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe
diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml
deleted file mode 100644
index c9ea7a2..0000000
--- a/core/app/views/common/_home_page_buttons.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-- icon_color = :black
-
-.home-buttons
- .row-fluid.first
- .span2
- .download.span8
- = render partial: 'common/download_for_os', collection: available_clients + ['other']
- .span2
- - if local_assigns[:divider]
- .row-fluid
- .span12
- = render local_assigns[:divider]
- - if !local_assigns[:on_user_page]
- .row-fluid.second
- .login.span4
- %span.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn')
- %span.info= t(:login_info)
- .signup.span4
- %span.link= link_to(icon('user', icon_color) + t(:signup), signup_path, :class => 'btn')
- %span.info= t(:signup_info)
- .help.span4
- %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), new_ticket_path, :class => 'btn')
- %span.info= t(:help_info)
diff --git a/core/app/views/kaminari/_first_page.html.haml b/core/app/views/kaminari/_first_page.html.haml
deleted file mode 100644
index 34436e3..0000000
--- a/core/app/views/kaminari/_first_page.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
--# Link to the "First" page
--# available local variables
--# url: url to the first page
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
-%li
- = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
diff --git a/core/app/views/kaminari/_gap.html.haml b/core/app/views/kaminari/_gap.html.haml
deleted file mode 100644
index 51de678..0000000
--- a/core/app/views/kaminari/_gap.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
--# Non-link tag that stands for skipped pages...
--# available local variables
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
-%li.disabled
- = raw(t 'views.pagination.truncate')
diff --git a/core/app/views/kaminari/_last_page.html.haml b/core/app/views/kaminari/_last_page.html.haml
deleted file mode 100644
index c90433c..0000000
--- a/core/app/views/kaminari/_last_page.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
--# Link to the "Last" page
--# available local variables
--# url: url to the last page
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
-%li
- = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
diff --git a/core/app/views/kaminari/_next_page.html.haml b/core/app/views/kaminari/_next_page.html.haml
deleted file mode 100644
index ea6cab2..0000000
--- a/core/app/views/kaminari/_next_page.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
--# Link to the "Next" page
--# available local variables
--# url: url to the next page
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
-- if current_page.last?
- %li.disabled
- %span= raw(t 'views.pagination.next')
-- else
- %li= link_to(raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote)
diff --git a/core/app/views/kaminari/_page.html.haml b/core/app/views/kaminari/_page.html.haml
deleted file mode 100644
index 2f2f142..0000000
--- a/core/app/views/kaminari/_page.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
--# Link showing page number
--# available local variables
--# page: a page object for "this" page
--# url: url to this page
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
-
-- if page.current?
- %li.active
- %span= page
-- else
- %li= link_to(page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil})
diff --git a/core/app/views/kaminari/_paginator.html.haml b/core/app/views/kaminari/_paginator.html.haml
deleted file mode 100644
index 79c5b92..0000000
--- a/core/app/views/kaminari/_paginator.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
--# The container tag
--# available local variables
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
--# paginator: the paginator that renders the pagination tags inside
-= paginator.render do
- .pagination
- %ul
- -#= first_page_tag unless current_page.first?
- = prev_page_tag #unless current_page.first?
- - each_page do |page|
- - if page.left_outer? || page.right_outer? || page.inside_window?
- = page_tag page
- - elsif !page.was_truncated?
- = gap_tag
- = next_page_tag #unless current_page.last?
- -#= last_page_tag unless current_page.last?
diff --git a/core/app/views/kaminari/_prev_page.html.haml b/core/app/views/kaminari/_prev_page.html.haml
deleted file mode 100644
index d274bf4..0000000
--- a/core/app/views/kaminari/_prev_page.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
--# Link to the "Previous" page
--# available local variables
--# url: url to the previous page
--# current_page: a page object for the currently displayed page
--# num_pages: total number of pages
--# per_page: number of items to fetch per page
--# remote: data-remote
-- if current_page.first?
- %li.disabled
- %span= raw(t 'views.pagination.previous')
-- else
- %li= link_to(raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote)