aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2015-09-15 14:05:52 +0200
committerMichel Etienne2015-09-15 14:05:52 +0200
commit41b99b39816cc4edfb0e7936d004f054fd963d40 (patch)
treea9107b9d91b9763ddaf33d8898c150a828e51c24
parentb76cda8e9ce414f666c51799d1665bf4d45f3049 (diff)
downloadchouette-core-41b99b39816cc4edfb0e7936d004f054fd963d40.tar.bz2
Mantis 38589 : cannot show or copy api-key
-rw-r--r--app/assets/stylesheets/main/api_keys.css.scss3
-rw-r--r--app/views/api_keys/_form.html.erb2
-rw-r--r--app/views/help/introduction.textile2
-rw-r--r--config/environment.rb2
-rw-r--r--config/locales/api_keys.yml4
5 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/main/api_keys.css.scss b/app/assets/stylesheets/main/api_keys.css.scss
index 5ac873da7..61dff90b8 100644
--- a/app/assets/stylesheets/main/api_keys.css.scss
+++ b/app/assets/stylesheets/main/api_keys.css.scss
@@ -4,5 +4,8 @@
#workspace.api_keys.show
{
+ .summary p label {
+ font-weight: bold;
+ }
}
diff --git a/app/views/api_keys/_form.html.erb b/app/views/api_keys/_form.html.erb
index de3f9ad7e..0adff4155 100644
--- a/app/views/api_keys/_form.html.erb
+++ b/app/views/api_keys/_form.html.erb
@@ -2,7 +2,7 @@
<%= form.inputs do %>
<%= form.input :name %>
<% unless @api_key.new_record? %>
- <%= form.input :token, :input_html => { :disabled => true } %>
+ <%= form.input :token, :input_html => { :readonly => true } %>
<% end %>
<% end %>
diff --git a/app/views/help/introduction.textile b/app/views/help/introduction.textile
index f2e8df735..8a30e7e0e 100644
--- a/app/views/help/introduction.textile
+++ b/app/views/help/introduction.textile
@@ -16,7 +16,7 @@ D'autres utilisateurs potentiels sont également identifiés : services de l'ét
h3. Ce que vous trouverez dans ce manuel
Vous trouverez dans ce document, toutes les informations nécessaires à la prise en main de l’application.
-Le manuel couvre la version 3.0.0.
+Le manuel couvre la version 3.0.1.
diff --git a/config/environment.rb b/config/environment.rb
index ebc5d5098..dd88c63b5 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,4 +5,4 @@ require File.expand_path('../application', __FILE__)
Rails.application.initialize!
# Fix version
-APP_VERSION = '3.0.0'
+APP_VERSION = '3.0.1'
diff --git a/config/locales/api_keys.yml b/config/locales/api_keys.yml
index e64bbb5b5..4db6d7e81 100644
--- a/config/locales/api_keys.yml
+++ b/config/locales/api_keys.yml
@@ -5,6 +5,8 @@ en:
edit: "Edit this api key"
destroy: "Remove this api key"
destroy_confirm: "Are you sure you want destroy this api key?"
+ show:
+ title: "Api key"
new:
title: "Add a new api key"
edit:
@@ -23,6 +25,8 @@ fr:
edit: "Modifier la clé d'accès API"
destroy: "Supprimer la clé d'accès API"
destroy_confirm: "Etes vous sûr de vouloir détruire la clé d'accès API ?"
+ show:
+ title: "Clé d'accès API"
new:
title: "Ajouter une clé d'accès API"
edit: