Project

General

Profile

Revision 89829224

ID8982922483263d4c365b309523de66e317d7e8aa
Parent 2832ea2b
Child c61b04c0

Added by Francois POIROTTE over 13 years ago

Quelques améliorations dans le vigigraph mootoolsifié.
Ajout de l'impression globale de tous les graphes visibles (#299).
Mise à jour des traductions de VigiGraph et des thèmes.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@5128 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigigraph/controllers/rpc.py
17 17
from tg.decorators import paginate
18 18
from repoze.what.predicates import not_anonymous, has_permission, \
19 19
                                    in_group, Any, All
20
from formencode import validators, schema
20
from formencode import validators, schema, foreach
21 21
from sqlalchemy import or_
22 22
from sqlalchemy.sql.expression import literal_column
23 23

  
......
180 180
    def graphsList(self, nocache=None, **kwargs):
181 181
        """
182 182
        Generation document avec url des graphes affiches
183
        (pour l impression )
183
        (pour impression)
184 184

  
185 185
        @param kwargs : arguments nommes
186 186
        @type kwargs  : dict
......
188 188
        @return: url de graphes
189 189
        @rtype: document html
190 190
        """
191
        # @TODO: le must serait de hot-patcher mootools pour que son serializer
192
        # d'URL utilise directement le format attendu par TurboGears
193
        # (notation pointée plutôt qu'avec des crochets)
194

  
191 195
        if not kwargs:
192 196
            return dict(graphslist=[])
193 197

  
......
195 199
        # n'accepte pas les chaînes Unicode en entrée.
196 200
        # TRANSLATORS: Format Python de date/heure, lisible par un humain.
197 201
        format = _("%a, %d %b %Y %H:%M:%S").encode('utf8')
202
        i = 0
198 203
        graphslist = []
199
        for url in kwargs.itervalues():
200
            parts = urlparse.urlparse(url)
201
            params = dict(parse_qsl(parts.query))
202

  
203
            graph = {}
204
            start = int(params.get('start', time.time() - 86400))
205
            duration = int(params.get('duration', 86400))
206

  
207
            graph['graph'] = params.get('graphtemplate')
208
            graph['start_date'] = time.strftime(format,
209
                time.localtime(start)).decode('utf8')
210
            graph['end_date'] = time.strftime(format,
211
                time.localtime(start + duration)).decode('utf8')
212
            graph['img_src'] = url
213
            graph['host'] = params['host']
214
            graphslist.append(graph)
204

  
205
        while True:
206
            try:
207
                host = kwargs['graphs[%d][host]' % i]
208
                graph = kwargs['graphs[%d][graph]' % i]
209
                start = int(kwargs.get('graphs[%d][start]' % i, time.time() - 86400))
210
                duration = int(kwargs.get('graphs[%d][duration]' % i))
211
                nocache = kwargs['graphs[%d][nocache]' % i]
212
            except KeyError:
213
                break
214

  
215
            if not (host and graph and duration and nocache):
216
                break
217

  
218
            graphslist.append({
219
                'host': host,
220
                'graph': graph,
221
                'start': start,
222
                'duration': duration,
223
                'nocache': nocache,
224
                'start_date': time.strftime(format,
225
                    time.localtime(start)).decode('utf8'),
226
                'end_date': time.strftime(format,
227
                    time.localtime(start + duration)).decode('utf8')
228
            })
229
            i += 1
230

  
215 231
        return dict(graphslist=graphslist)
216 232

  
217 233
    @expose('json')
......
725 741
                ).filter(Host.name == host
726 742
                ).all()
727 743
        return indicators
728

  
vigigraph/i18n/en/LC_MESSAGES/vigigraph.po
7 7
msgstr ""
8 8
"Project-Id-Version: vigigraph 2.0.0\n"
9 9
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
10
"POT-Creation-Date: 2010-11-03 17:22+0100\n"
11
"PO-Revision-Date: 2010-11-03 17:23+0100\n"
10
"POT-Creation-Date: 2010-11-17 13:47+0100\n"
11
"PO-Revision-Date: 2010-11-17 13:47+0100\n"
12 12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13
"Language-Team: en <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
......
17 17
"Content-Transfer-Encoding: 8bit\n"
18 18
"Generated-By: Babel 0.9.4\n"
19 19

  
20
#: vigigraph/controllers/root.py:32 vigigraph/controllers/root.py:34
21
#: vigigraph/controllers/root.py:39 vigigraph/controllers/rpc.py:53
20
#: vigigraph/controllers/root.py:30 vigigraph/controllers/root.py:32
21
#: vigigraph/controllers/root.py:37 vigigraph/controllers/rpc.py:52
22 22
msgid "You need to be authenticated"
23 23
msgstr "You need to be authenticated"
24 24

  
25
#: vigigraph/controllers/root.py:43 vigigraph/controllers/rpc.py:57
25
#: vigigraph/controllers/root.py:41 vigigraph/controllers/rpc.py:56
26 26
msgid "You don't have access to VigiGraph"
27 27
msgstr "You don't have access to VigiGraph"
28 28

  
29
#: vigigraph/controllers/root.py:81
29
#: vigigraph/controllers/root.py:79
30 30
msgid "Wrong credentials"
31 31
msgstr "Wrong credentials"
32 32

  
33
#: vigigraph/controllers/root.py:96
33
#: vigigraph/controllers/root.py:94
34 34
#, python-format
35 35
msgid "\"%(username)s\" logged in (from %(IP)s)"
36 36
msgstr "\"%(username)s\" logged in (from %(IP)s)"
37 37

  
38
#: vigigraph/controllers/root.py:100
38
#: vigigraph/controllers/root.py:98
39 39
#, python-format
40 40
msgid "Welcome back, %s!"
41 41
msgstr "Welcome back, %s!"
42 42

  
43
#: vigigraph/controllers/root.py:110
43
#: vigigraph/controllers/root.py:108
44 44
#, python-format
45 45
msgid "Some user logged out (from %(IP)s)"
46 46
msgstr "Some user logged out (from %(IP)s)"
47 47

  
48
#: vigigraph/controllers/root.py:113
48
#: vigigraph/controllers/root.py:111
49 49
msgid "We hope to see you soon!"
50 50
msgstr "We hope to see you soon!"
51 51

  
52
#: vigigraph/controllers/rpc.py:62 vigigraph/controllers/rpc.py:63
52
#: vigigraph/controllers/rpc.py:61 vigigraph/controllers/rpc.py:62
53 53
#, python-format
54 54
msgid "Last %d hours"
55 55
msgstr "Last %d hours"
56 56

  
57
#: vigigraph/controllers/rpc.py:64 vigigraph/controllers/rpc.py:65
58
#: vigigraph/controllers/rpc.py:66
57
#: vigigraph/controllers/rpc.py:63 vigigraph/controllers/rpc.py:64
58
#: vigigraph/controllers/rpc.py:65
59 59
#, python-format
60 60
msgid "Last %d days"
61 61
msgstr "Last %d days"
62 62

  
63
#: vigigraph/controllers/rpc.py:67 vigigraph/controllers/rpc.py:68
63
#: vigigraph/controllers/rpc.py:66 vigigraph/controllers/rpc.py:67
64 64
#, python-format
65 65
msgid "Last %d months"
66 66
msgstr "Last %d months"
67 67

  
68
#: vigigraph/controllers/rpc.py:69 vigigraph/public/js/graph.js:42
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:37
69 69
msgid "Last year"
70 70
msgstr "Last year"
71 71

  
72
#: vigigraph/controllers/rpc.py:173 vigigraph/controllers/rpc.py:546
73
msgid "No subgroup"
74
msgstr "No subgroup"
75

  
76
#: vigigraph/controllers/rpc.py:470
77
msgid "No host given"
78
msgstr "No host given"
79

  
80 72
#. TRANSLATORS: Format Python de date/heure, lisible par un humain.
81
#: vigigraph/controllers/rpc.py:568
73
#: vigigraph/controllers/rpc.py:201
82 74
#, python-format
83 75
msgid "%a, %d %b %Y %H:%M:%S"
84 76
msgstr "%a, %d %b %Y %H:%M:%S"
85 77

  
86
#: vigigraph/public/js/graph.js:12
87
msgid "Reload the graph"
88
msgstr "Reload the graph"
89

  
90
#: vigigraph/public/js/graph.js:16
91
msgid "Timeframe"
92
msgstr "Timeframe"
93

  
94
#: vigigraph/public/js/graph.js:18
95
msgid "Timeframe menu"
96
msgstr "Timeframe menu"
97

  
98
#: vigigraph/public/js/graph.js:21
78
#: vigigraph/public/js/graph.js:30
99 79
msgid "Last 12 hours"
100 80
msgstr "Last 12 hours"
101 81

  
102
#: vigigraph/public/js/graph.js:24
82
#: vigigraph/public/js/graph.js:31
103 83
msgid "Last 24 hours"
104 84
msgstr "Last 24 hours"
105 85

  
106
#: vigigraph/public/js/graph.js:27
86
#: vigigraph/public/js/graph.js:32
107 87
msgid "Last 48 hours"
108 88
msgstr "Last 48 hours"
109 89

  
110
#: vigigraph/public/js/graph.js:30
90
#: vigigraph/public/js/graph.js:33
111 91
msgid "Last 7 days"
112 92
msgstr "Last 7 days"
113 93

  
114
#: vigigraph/public/js/graph.js:33
94
#: vigigraph/public/js/graph.js:34
115 95
msgid "Last 14 days"
116 96
msgstr "Last 14 days"
117 97

  
118
#: vigigraph/public/js/graph.js:36
98
#: vigigraph/public/js/graph.js:35
119 99
msgid "Last 3 months"
120 100
msgstr "Last 3 months"
121 101

  
122
#: vigigraph/public/js/graph.js:39
102
#: vigigraph/public/js/graph.js:36
123 103
msgid "Last 6 months"
124 104
msgstr "Last 6 months"
125 105

  
126
#: vigigraph/public/js/graph.js:47
106
#: vigigraph/public/js/graph.js:41
107
msgid "Timeframe"
108
msgstr "Timeframe"
109

  
110
#: vigigraph/public/js/graph.js:43
111
msgid "Timeframe menu"
112
msgstr "Timeframe menu"
113

  
114
#: vigigraph/public/js/graph.js:59
115
msgid "Export to CSV"
116
msgstr "Export to CSV"
117

  
118
#: vigigraph/public/js/graph.js:61
119
msgid "Export the content of this graph to CSV"
120
msgstr "Export the content of this graph to CSV"
121

  
122
#: vigigraph/public/js/graph.js:76
123
msgid "All"
124
msgstr "All"
125

  
126
#: vigigraph/public/js/graph.js:88
127
msgid "Automatically refresh the graph"
128
msgstr "Automatically refresh the graph"
129

  
130
#: vigigraph/public/js/graph.js:114
127 131
msgid "Graph start"
128 132
msgstr "Graph start"
129 133

  
130
#: vigigraph/public/js/graph.js:54
134
#: vigigraph/public/js/graph.js:122
131 135
msgid "Previous section"
132 136
msgstr "Previous section"
133 137

  
134
#: vigigraph/public/js/graph.js:61
138
#: vigigraph/public/js/graph.js:130
135 139
msgid "Next section"
136 140
msgstr "Next section"
137 141

  
138
#: vigigraph/public/js/graph.js:68
142
#: vigigraph/public/js/graph.js:138
139 143
msgid "Graph end"
140 144
msgstr "Graph end"
141 145

  
142
#: vigigraph/public/js/graph.js:75
146
#: vigigraph/public/js/graph.js:146
143 147
msgid "Zoom in"
144 148
msgstr "Zoom in"
145 149

  
146
#: vigigraph/public/js/graph.js:82
150
#: vigigraph/public/js/graph.js:156
147 151
msgid "Zoom out"
148 152
msgstr "Zoom out"
149 153

  
150
#: vigigraph/public/js/graph.js:88
151
msgid "Export to CSV"
152
msgstr "Export to CSV"
154
#: vigigraph/public/js/graph.js:165
155
msgid "Print graph"
156
msgstr "Print graph"
153 157

  
154
#: vigigraph/public/js/graph.js:90
155
msgid "Export the content of this graph to CSV"
156
msgstr "Export the content of this graph to CSV"
158
#: vigigraph/public/js/graph.js:170
159
#, python-format
160
msgid "Graph for \"%(graph)s\" on \"%(host)s\""
161
msgstr "Graph for \"%(graph)s\" on \"%(host)s\""
157 162

  
158
#: vigigraph/public/js/graph.js:106
159
msgid "All"
160
msgstr "All"
163
#: vigigraph/public/js/graph.js:308
164
#, python-format
165
msgid ""
166
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"
167
"Make sure VigiRRD is running and receives performance data."
168
msgstr ""
169
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"
170
"Make sure VigiRRD is running and receives performance data."
161 171

  
162
#: vigigraph/public/js/graph.js:111
163
msgid "Print graph"
164
msgstr "Print graph"
172
#: vigigraph/public/js/toolbar.js:39
173
msgid "Globally change auto-refresh setting"
174
msgstr "Globally change auto-refresh setting"
165 175

  
166
#: vigigraph/public/js/graph.js:119 vigigraph/widgets/host_picker.py:37
167
#: vigigraph/widgets/host_picker.py:76
168
msgid "Graph"
169
msgstr "Graph"
176
#: vigigraph/public/js/toolbar.js:55
177
msgid "Host:"
178
msgstr "Host:"
170 179

  
171
#: vigigraph/public/js/host_picker.js:3
172
msgid "Host Picker"
173
msgstr "Host Picker"
180
#: vigigraph/public/js/toolbar.js:58
181
msgid "Select a host"
182
msgstr "Select a host"
174 183

  
175
#: vigigraph/widgets/host_picker.py:13 vigigraph/widgets/host_picker.py:52
176
msgid "Choose"
177
msgstr "Choose"
184
#: vigigraph/public/js/toolbar.js:59
185
msgid "Click me to select another host"
186
msgstr "Click me to select another host"
178 187

  
179
#: vigigraph/widgets/host_picker.py:14 vigigraph/widgets/host_picker.py:53
180
msgid "→"
181
msgstr "→"
188
#: vigigraph/public/js/toolbar.js:77
189
msgid "Nagios page"
190
msgstr "Nagios page"
191

  
192
#: vigigraph/public/js/toolbar.js:78
193
msgid "Display Nagios page for the selected host"
194
msgstr "Display Nagios page for the selected host"
195

  
196
#: vigigraph/public/js/toolbar.js:102
197
msgid "Graph:"
198
msgstr "Graph:"
199

  
200
#: vigigraph/public/js/toolbar.js:105
201
msgid "Select a graph"
202
msgstr "Select a graph"
203

  
204
#: vigigraph/public/js/toolbar.js:106
205
msgid "Click me to select another graph"
206
msgstr "Click me to select another graph"
207

  
208
#: vigigraph/public/js/toolbar.js:114
209
msgid "Graph"
210
msgstr "Graph"
182 211

  
183
#: vigigraph/widgets/host_picker.py:36 vigigraph/widgets/host_picker.py:75
184
msgid "Host"
185
msgstr "Host"
212
#: vigigraph/public/js/toolbar.js:115
213
msgid "Display the contents of the selected graph"
214
msgstr "Display the contents of the selected graph"
186 215

  
vigigraph/i18n/fr/LC_MESSAGES/vigigraph.po
8 8
"Project-Id-Version: vigigraph 0.1\n"
9 9
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
10 10
"POT-Creation-Date: 2010-02-15 13:41+0100\n"
11
"PO-Revision-Date: 2010-11-03 17:22+0100\n"
11
"PO-Revision-Date: 2010-11-17 13:47+0100\n"
12 12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13
"Language-Team: fr_FR <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
......
17 17
"Content-Transfer-Encoding: 8bit\n"
18 18
"Generated-By: Babel 0.9.4\n"
19 19

  
20
#: vigigraph/controllers/root.py:32 vigigraph/controllers/root.py:34
21
#: vigigraph/controllers/root.py:39 vigigraph/controllers/rpc.py:53
20
#: vigigraph/controllers/root.py:30 vigigraph/controllers/root.py:32
21
#: vigigraph/controllers/root.py:37 vigigraph/controllers/rpc.py:52
22 22
msgid "You need to be authenticated"
23 23
msgstr "Vous devez vous authentifier"
24 24

  
25
#: vigigraph/controllers/root.py:43 vigigraph/controllers/rpc.py:57
25
#: vigigraph/controllers/root.py:41 vigigraph/controllers/rpc.py:56
26 26
msgid "You don't have access to VigiGraph"
27 27
msgstr "Vous n'avez pas accès à VigiGraph"
28 28

  
29
#: vigigraph/controllers/root.py:81
29
#: vigigraph/controllers/root.py:79
30 30
msgid "Wrong credentials"
31 31
msgstr "Identifiant ou mot de passe incorrect"
32 32

  
33
#: vigigraph/controllers/root.py:96
33
#: vigigraph/controllers/root.py:94
34 34
#, python-format
35 35
msgid "\"%(username)s\" logged in (from %(IP)s)"
36 36
msgstr "\"%(username)s\" s'est connecté (depuis %(IP)s)"
37 37

  
38
#: vigigraph/controllers/root.py:100
38
#: vigigraph/controllers/root.py:98
39 39
#, python-format
40 40
msgid "Welcome back, %s!"
41 41
msgstr "Bienvenue, %s !"
42 42

  
43
#: vigigraph/controllers/root.py:110
43
#: vigigraph/controllers/root.py:108
44 44
#, python-format
45 45
msgid "Some user logged out (from %(IP)s)"
46 46
msgstr "Un utilisateur s'est déconnecté (depuis %(IP)s)"
47 47

  
48
#: vigigraph/controllers/root.py:113
48
#: vigigraph/controllers/root.py:111
49 49
msgid "We hope to see you soon!"
50 50
msgstr "Au plaisir de vous revoir !"
51 51

  
52
#: vigigraph/controllers/rpc.py:62 vigigraph/controllers/rpc.py:63
52
#: vigigraph/controllers/rpc.py:61 vigigraph/controllers/rpc.py:62
53 53
#, python-format
54 54
msgid "Last %d hours"
55 55
msgstr "Les %d dernières heures"
56 56

  
57
#: vigigraph/controllers/rpc.py:64 vigigraph/controllers/rpc.py:65
58
#: vigigraph/controllers/rpc.py:66
57
#: vigigraph/controllers/rpc.py:63 vigigraph/controllers/rpc.py:64
58
#: vigigraph/controllers/rpc.py:65
59 59
#, python-format
60 60
msgid "Last %d days"
61 61
msgstr "Les %d derniers jours"
62 62

  
63
#: vigigraph/controllers/rpc.py:67 vigigraph/controllers/rpc.py:68
63
#: vigigraph/controllers/rpc.py:66 vigigraph/controllers/rpc.py:67
64 64
#, python-format
65 65
msgid "Last %d months"
66 66
msgstr "Les %d derniers mois"
67 67

  
68
#: vigigraph/controllers/rpc.py:69 vigigraph/public/js/graph.js:42
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:37
69 69
msgid "Last year"
70 70
msgstr "L'an dernier"
71 71

  
72
#: vigigraph/controllers/rpc.py:173 vigigraph/controllers/rpc.py:546
73
msgid "No subgroup"
74
msgstr "Pas de sous-groupe"
75

  
76
#: vigigraph/controllers/rpc.py:470
77
msgid "No host given"
78
msgstr "Aucun hôte n'a été donné"
79

  
80 72
#. TRANSLATORS: Format Python de date/heure, lisible par un humain.
81
#: vigigraph/controllers/rpc.py:568
73
#: vigigraph/controllers/rpc.py:201
82 74
#, python-format
83 75
msgid "%a, %d %b %Y %H:%M:%S"
84 76
msgstr "%d/%m/%Y à %H:%M:%S"
85 77

  
86
#: vigigraph/public/js/graph.js:12
87
msgid "Reload the graph"
88
msgstr "Recharger le graphe"
89

  
90
#: vigigraph/public/js/graph.js:16
91
msgid "Timeframe"
92
msgstr "Période"
93

  
94
#: vigigraph/public/js/graph.js:18
95
msgid "Timeframe menu"
96
msgstr "Menu de choix de la période"
97

  
98
#: vigigraph/public/js/graph.js:21
78
#: vigigraph/public/js/graph.js:30
99 79
msgid "Last 12 hours"
100 80
msgstr "12 dernières heures"
101 81

  
102
#: vigigraph/public/js/graph.js:24
82
#: vigigraph/public/js/graph.js:31
103 83
msgid "Last 24 hours"
104 84
msgstr "24 dernières heures"
105 85

  
106
#: vigigraph/public/js/graph.js:27
86
#: vigigraph/public/js/graph.js:32
107 87
msgid "Last 48 hours"
108 88
msgstr "48 dernières heures"
109 89

  
110
#: vigigraph/public/js/graph.js:30
90
#: vigigraph/public/js/graph.js:33
111 91
msgid "Last 7 days"
112 92
msgstr "7 derniers jours"
113 93

  
114
#: vigigraph/public/js/graph.js:33
94
#: vigigraph/public/js/graph.js:34
115 95
msgid "Last 14 days"
116 96
msgstr "14 derniers jours"
117 97

  
118
#: vigigraph/public/js/graph.js:36
98
#: vigigraph/public/js/graph.js:35
119 99
msgid "Last 3 months"
120 100
msgstr "3 derniers mois"
121 101

  
122
#: vigigraph/public/js/graph.js:39
102
#: vigigraph/public/js/graph.js:36
123 103
msgid "Last 6 months"
124 104
msgstr "6 derniers mois"
125 105

  
126
#: vigigraph/public/js/graph.js:47
106
#: vigigraph/public/js/graph.js:41
107
msgid "Timeframe"
108
msgstr "Période"
109

  
110
#: vigigraph/public/js/graph.js:43
111
msgid "Timeframe menu"
112
msgstr "Menu de choix de la période"
113

  
114
#: vigigraph/public/js/graph.js:59
115
msgid "Export to CSV"
116
msgstr "Export CSV"
117

  
118
#: vigigraph/public/js/graph.js:61
119
msgid "Export the content of this graph to CSV"
120
msgstr "Exporte le contenu du graphe au format CSV"
121

  
122
#: vigigraph/public/js/graph.js:76
123
msgid "All"
124
msgstr "Tous"
125

  
126
#: vigigraph/public/js/graph.js:88
127
msgid "Automatically refresh the graph"
128
msgstr "Rafraîchissement automatique du graphe"
129

  
130
#: vigigraph/public/js/graph.js:114
127 131
msgid "Graph start"
128 132
msgstr "Début du graphe"
129 133

  
130
#: vigigraph/public/js/graph.js:54
134
#: vigigraph/public/js/graph.js:122
131 135
msgid "Previous section"
132 136
msgstr "Section précédente"
133 137

  
134
#: vigigraph/public/js/graph.js:61
138
#: vigigraph/public/js/graph.js:130
135 139
msgid "Next section"
136 140
msgstr "Section suivante"
137 141

  
138
#: vigigraph/public/js/graph.js:68
142
#: vigigraph/public/js/graph.js:138
139 143
msgid "Graph end"
140 144
msgstr "Fin du graphe"
141 145

  
142
#: vigigraph/public/js/graph.js:75
146
#: vigigraph/public/js/graph.js:146
143 147
msgid "Zoom in"
144 148
msgstr "Zoomer"
145 149

  
146
#: vigigraph/public/js/graph.js:82
150
#: vigigraph/public/js/graph.js:156
147 151
msgid "Zoom out"
148 152
msgstr "Dézoomer"
149 153

  
150
#: vigigraph/public/js/graph.js:88
151
msgid "Export to CSV"
152
msgstr "Export CSV"
154
#: vigigraph/public/js/graph.js:165
155
msgid "Print graph"
156
msgstr "Imprimer le graphe"
153 157

  
154
#: vigigraph/public/js/graph.js:90
155
msgid "Export the content of this graph to CSV"
156
msgstr "Exporte le contenu du graphe au format CSV"
158
#: vigigraph/public/js/graph.js:170
159
#, python-format
160
msgid "Graph for \"%(graph)s\" on \"%(host)s\""
161
msgstr "Graphe pour \"%(graph)s\" sur \"%(host)s\""
157 162

  
158
#: vigigraph/public/js/graph.js:106
159
msgid "All"
160
msgstr "Tous"
163
#: vigigraph/public/js/graph.js:308
164
#, python-format
165
msgid ""
166
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"
167
"Make sure VigiRRD is running and receives performance data."
168
msgstr ""
169
"Impossible de charger le graphe pour \"%(graph)s\" sur \"%(host)s\"\n"
170
"Assurez-vous que VigiRRD fonctionne et qu'il reçoit des données "
171
"de métrologie."
161 172

  
162
#: vigigraph/public/js/graph.js:111
163
msgid "Print graph"
164
msgstr "Imprimer le graphe"
173
#: vigigraph/public/js/toolbar.js:39
174
msgid "Globally change auto-refresh setting"
175
msgstr "Modifier le rafraîchissement automatique globalement"
165 176

  
166
#: vigigraph/public/js/graph.js:119 vigigraph/widgets/host_picker.py:37
167
#: vigigraph/widgets/host_picker.py:76
168
msgid "Graph"
169
msgstr "Graphe"
177
#: vigigraph/public/js/toolbar.js:55
178
msgid "Host:"
179
msgstr "Hôte :"
170 180

  
171
#: vigigraph/public/js/host_picker.js:3
172
msgid "Host Picker"
173
msgstr "Sélection d'un hôte"
181
#: vigigraph/public/js/toolbar.js:58
182
msgid "Select a host"
183
msgstr "Sélectionner un hôte"
174 184

  
175
#: vigigraph/widgets/host_picker.py:13 vigigraph/widgets/host_picker.py:52
176
msgid "Choose"
177
msgstr "Choisir"
185
#: vigigraph/public/js/toolbar.js:59
186
msgid "Click me to select another host"
187
msgstr "Cliquez-moi pour sélectionner un autre hôte"
178 188

  
179
#: vigigraph/widgets/host_picker.py:14 vigigraph/widgets/host_picker.py:53
180
msgid "→"
181
msgstr "→"
189
#: vigigraph/public/js/toolbar.js:77
190
msgid "Nagios page"
191
msgstr "Page Nagios"
192

  
193
#: vigigraph/public/js/toolbar.js:78
194
msgid "Display Nagios page for the selected host"
195
msgstr "Affiche la page Nagios de l'hôte sélectionné"
196

  
197
#: vigigraph/public/js/toolbar.js:102
198
msgid "Graph:"
199
msgstr "Graphe :"
200

  
201
#: vigigraph/public/js/toolbar.js:105
202
msgid "Select a graph"
203
msgstr "Sélectionner un graphe"
204

  
205
#: vigigraph/public/js/toolbar.js:106
206
msgid "Click me to select another graph"
207
msgstr "Cliquez-moi pour sélectionner un autre graphe"
208

  
209
#: vigigraph/public/js/toolbar.js:114
210
msgid "Graph"
211
msgstr "Graphe"
182 212

  
183
#: vigigraph/widgets/host_picker.py:36 vigigraph/widgets/host_picker.py:75
184
msgid "Host"
185
msgstr "Hôte"
213
#: vigigraph/public/js/toolbar.js:115
214
msgid "Display the contents of the selected graph"
215
msgstr "Affiche le contenu du graphe sélectionné"
vigigraph/i18n/vigigraph.pot
8 8
msgstr ""
9 9
"Project-Id-Version: vigigraph 2.0.0\n"
10 10
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
11
"POT-Creation-Date: 2010-11-03 17:22+0100\n"
11
"POT-Creation-Date: 2010-11-17 13:47+0100\n"
12 12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
"Language-Team: LANGUAGE <LL@li.org>\n"
......
17 17
"Content-Transfer-Encoding: 8bit\n"
18 18
"Generated-By: Babel 0.9.4\n"
19 19

  
20
#: vigigraph/controllers/root.py:32 vigigraph/controllers/root.py:34
21
#: vigigraph/controllers/root.py:39 vigigraph/controllers/rpc.py:53
20
#: vigigraph/controllers/root.py:30 vigigraph/controllers/root.py:32
21
#: vigigraph/controllers/root.py:37 vigigraph/controllers/rpc.py:52
22 22
msgid "You need to be authenticated"
23 23
msgstr ""
24 24

  
25
#: vigigraph/controllers/root.py:43 vigigraph/controllers/rpc.py:57
25
#: vigigraph/controllers/root.py:41 vigigraph/controllers/rpc.py:56
26 26
msgid "You don't have access to VigiGraph"
27 27
msgstr ""
28 28

  
29
#: vigigraph/controllers/root.py:81
29
#: vigigraph/controllers/root.py:79
30 30
msgid "Wrong credentials"
31 31
msgstr ""
32 32

  
33
#: vigigraph/controllers/root.py:96
33
#: vigigraph/controllers/root.py:94
34 34
#, python-format
35 35
msgid "\"%(username)s\" logged in (from %(IP)s)"
36 36
msgstr ""
37 37

  
38
#: vigigraph/controllers/root.py:100
38
#: vigigraph/controllers/root.py:98
39 39
#, python-format
40 40
msgid "Welcome back, %s!"
41 41
msgstr ""
42 42

  
43
#: vigigraph/controllers/root.py:110
43
#: vigigraph/controllers/root.py:108
44 44
#, python-format
45 45
msgid "Some user logged out (from %(IP)s)"
46 46
msgstr ""
47 47

  
48
#: vigigraph/controllers/root.py:113
48
#: vigigraph/controllers/root.py:111
49 49
msgid "We hope to see you soon!"
50 50
msgstr ""
51 51

  
52
#: vigigraph/controllers/rpc.py:62 vigigraph/controllers/rpc.py:63
52
#: vigigraph/controllers/rpc.py:61 vigigraph/controllers/rpc.py:62
53 53
#, python-format
54 54
msgid "Last %d hours"
55 55
msgstr ""
56 56

  
57
#: vigigraph/controllers/rpc.py:64 vigigraph/controllers/rpc.py:65
58
#: vigigraph/controllers/rpc.py:66
57
#: vigigraph/controllers/rpc.py:63 vigigraph/controllers/rpc.py:64
58
#: vigigraph/controllers/rpc.py:65
59 59
#, python-format
60 60
msgid "Last %d days"
61 61
msgstr ""
62 62

  
63
#: vigigraph/controllers/rpc.py:67 vigigraph/controllers/rpc.py:68
63
#: vigigraph/controllers/rpc.py:66 vigigraph/controllers/rpc.py:67
64 64
#, python-format
65 65
msgid "Last %d months"
66 66
msgstr ""
67 67

  
68
#: vigigraph/controllers/rpc.py:69 vigigraph/public/js/graph.js:42
68
#: vigigraph/controllers/rpc.py:68 vigigraph/public/js/graph.js:37
69 69
msgid "Last year"
70 70
msgstr ""
71 71

  
72
#: vigigraph/controllers/rpc.py:173 vigigraph/controllers/rpc.py:546
73
msgid "No subgroup"
74
msgstr ""
75

  
76
#: vigigraph/controllers/rpc.py:470
77
msgid "No host given"
78
msgstr ""
79

  
80 72
#. TRANSLATORS: Format Python de date/heure, lisible par un humain.
81
#: vigigraph/controllers/rpc.py:568
73
#: vigigraph/controllers/rpc.py:201
82 74
#, python-format
83 75
msgid "%a, %d %b %Y %H:%M:%S"
84 76
msgstr ""
85 77

  
86
#: vigigraph/public/js/graph.js:12
87
msgid "Reload the graph"
88
msgstr ""
89

  
90
#: vigigraph/public/js/graph.js:16
91
msgid "Timeframe"
92
msgstr ""
93

  
94
#: vigigraph/public/js/graph.js:18
95
msgid "Timeframe menu"
96
msgstr ""
97

  
98
#: vigigraph/public/js/graph.js:21
78
#: vigigraph/public/js/graph.js:30
99 79
msgid "Last 12 hours"
100 80
msgstr ""
101 81

  
102
#: vigigraph/public/js/graph.js:24
82
#: vigigraph/public/js/graph.js:31
103 83
msgid "Last 24 hours"
104 84
msgstr ""
105 85

  
106
#: vigigraph/public/js/graph.js:27
86
#: vigigraph/public/js/graph.js:32
107 87
msgid "Last 48 hours"
108 88
msgstr ""
109 89

  
110
#: vigigraph/public/js/graph.js:30
90
#: vigigraph/public/js/graph.js:33
111 91
msgid "Last 7 days"
112 92
msgstr ""
113 93

  
114
#: vigigraph/public/js/graph.js:33
94
#: vigigraph/public/js/graph.js:34
115 95
msgid "Last 14 days"
116 96
msgstr ""
117 97

  
118
#: vigigraph/public/js/graph.js:36
98
#: vigigraph/public/js/graph.js:35
119 99
msgid "Last 3 months"
120 100
msgstr ""
121 101

  
122
#: vigigraph/public/js/graph.js:39
102
#: vigigraph/public/js/graph.js:36
123 103
msgid "Last 6 months"
124 104
msgstr ""
125 105

  
126
#: vigigraph/public/js/graph.js:47
106
#: vigigraph/public/js/graph.js:41
107
msgid "Timeframe"
108
msgstr ""
109

  
110
#: vigigraph/public/js/graph.js:43
111
msgid "Timeframe menu"
112
msgstr ""
113

  
114
#: vigigraph/public/js/graph.js:59
115
msgid "Export to CSV"
116
msgstr ""
117

  
118
#: vigigraph/public/js/graph.js:61
119
msgid "Export the content of this graph to CSV"
120
msgstr ""
121

  
122
#: vigigraph/public/js/graph.js:76
123
msgid "All"
124
msgstr ""
125

  
126
#: vigigraph/public/js/graph.js:88
127
msgid "Automatically refresh the graph"
128
msgstr ""
129

  
130
#: vigigraph/public/js/graph.js:114
127 131
msgid "Graph start"
128 132
msgstr ""
129 133

  
130
#: vigigraph/public/js/graph.js:54
134
#: vigigraph/public/js/graph.js:122
131 135
msgid "Previous section"
132 136
msgstr ""
133 137

  
134
#: vigigraph/public/js/graph.js:61
138
#: vigigraph/public/js/graph.js:130
135 139
msgid "Next section"
136 140
msgstr ""
137 141

  
138
#: vigigraph/public/js/graph.js:68
142
#: vigigraph/public/js/graph.js:138
139 143
msgid "Graph end"
140 144
msgstr ""
141 145

  
142
#: vigigraph/public/js/graph.js:75
146
#: vigigraph/public/js/graph.js:146
143 147
msgid "Zoom in"
144 148
msgstr ""
145 149

  
146
#: vigigraph/public/js/graph.js:82
150
#: vigigraph/public/js/graph.js:156
147 151
msgid "Zoom out"
148 152
msgstr ""
149 153

  
150
#: vigigraph/public/js/graph.js:88
151
msgid "Export to CSV"
154
#: vigigraph/public/js/graph.js:165
155
msgid "Print graph"
152 156
msgstr ""
153 157

  
154
#: vigigraph/public/js/graph.js:90
155
msgid "Export the content of this graph to CSV"
158
#: vigigraph/public/js/graph.js:170
159
#, python-format
160
msgid "Graph for \"%(graph)s\" on \"%(host)s\""
156 161
msgstr ""
157 162

  
158
#: vigigraph/public/js/graph.js:106
159
msgid "All"
163
#: vigigraph/public/js/graph.js:308
164
#, python-format
165
msgid ""
166
"Could not load the graph for \"%(graph)s\" on \"%(host)s\".\n"
167
"Make sure VigiRRD is running and receives performance data."
160 168
msgstr ""
161 169

  
162
#: vigigraph/public/js/graph.js:111
163
msgid "Print graph"
170
#: vigigraph/public/js/toolbar.js:39
171
msgid "Globally change auto-refresh setting"
164 172
msgstr ""
165 173

  
166
#: vigigraph/public/js/graph.js:119 vigigraph/widgets/host_picker.py:37
167
#: vigigraph/widgets/host_picker.py:76
168
msgid "Graph"
174
#: vigigraph/public/js/toolbar.js:55
175
msgid "Host:"
176
msgstr ""
177

  
178
#: vigigraph/public/js/toolbar.js:58
179
msgid "Select a host"
180
msgstr ""
181

  
182
#: vigigraph/public/js/toolbar.js:59
183
msgid "Click me to select another host"
169 184
msgstr ""
170 185

  
171
#: vigigraph/public/js/host_picker.js:3
172
msgid "Host Picker"
186
#: vigigraph/public/js/toolbar.js:77
187
msgid "Nagios page"
173 188
msgstr ""
174 189

  
175
#: vigigraph/widgets/host_picker.py:13 vigigraph/widgets/host_picker.py:52
176
msgid "Choose"
190
#: vigigraph/public/js/toolbar.js:78
191
msgid "Display Nagios page for the selected host"
177 192
msgstr ""
178 193

  
179
#: vigigraph/widgets/host_picker.py:14 vigigraph/widgets/host_picker.py:53
180
msgid "→"
194
#: vigigraph/public/js/toolbar.js:102
195
msgid "Graph:"
196
msgstr ""
197

  
198
#: vigigraph/public/js/toolbar.js:105
199
msgid "Select a graph"
200
msgstr ""
201

  
202
#: vigigraph/public/js/toolbar.js:106
203
msgid "Click me to select another graph"
204
msgstr ""
205

  
206
#: vigigraph/public/js/toolbar.js:114
207
msgid "Graph"
181 208
msgstr ""
182 209

  
183
#: vigigraph/widgets/host_picker.py:36 vigigraph/widgets/host_picker.py:75
184
msgid "Host"
210
#: vigigraph/public/js/toolbar.js:115
211
msgid "Display the contents of the selected graph"
185 212
msgstr ""
186 213

  
vigigraph/public/js/graph.js
85 85

  
86 86
        this.refresh_button = new Jx.Button({
87 87
            image: app_path + 'images/refresh.png',
88
            tooltip: _("Reload the graph"),
88
            tooltip: _("Automatically refresh the graph"),
89 89
            toggle: true,
90 90
            onDown: function() {
91 91
                // On s'assure qu'il n'y a pas déjà un timer lancé.
......
230 230
        uri.go();
231 231
    },
232 232

  
233
    getStartTime: function () {
234
        if (this.options.start == null)
235
            // @TODO: cette heure est en localtime a priori.
236
            return (new Date() / 1000).toInt() - this.options.duration;
237
        return this.options.start;
238
    },
239

  
233 240
    exportCSV: function (menuItem) {
234 241
        var uri = new URI(app_path + 'vigirrd/' +
235 242
            encodeURIComponent(this.host) + '/export');
236 243

  
237
        var start = this.options.start;
238
        if (start == null) {
239
            // @TODO: cette heure est en localtime a priori.
240
            start =
241
                (new Date() / 1000).toInt() -
242
                this.options.duration;
243
        }
244
        var start = this.getStartTime();
244 245

  
245 246
        uri.setData({
246 247
            host: this.host,
......
256 257
        window.open(uri.toString());
257 258
    },
258 259

  
260
    // Cette fonction est aussi utilisée dans print.js
261
    // pour gérer l'impression globale.
262
    getPrintParams: function () {
263
        var img = this.graph_window.content.getElement('img');
264
        var img_uri = new URI(img.src);
265
        var params = img_uri.getData();
266
        return {
267
            host: params.host,
268
            start: params.start,
269
            duration: params.duration,
270
            graph: params.graphtemplate,
271
            nocache: params.nocache
272
        }
273
    },
274

  
259 275
    print: function () {
260 276
        var uri = new URI(app_path + 'rpc/graphsList');
261
        var img = this.graph_window.content.getElement('img');
262
        uri.setData({graphs: [img.src]});
277
        uri.setData({graphs: [this.getPrintParams()]});
263 278
        var print_window = window.open(uri.toString());
264 279
        print_window.print();
265 280
    },
......
268 283
        var uri = new URI(app_path + 'vigirrd/' +
269 284
            encodeURIComponent(this.host) + '/graph.png');
270 285

  
271
        var start = this.options.start;
272
        if (start == null) {
273
            // @TODO: cette heure est en localtime a priori.
274
            start =
275
                (new Date() / 1000).toInt() -
276
                this.options.duration;
277
        }
286
        var start = this.getStartTime();
278 287

  
279 288
        uri.setData({
280 289
            host: this.host,

Also available in: Unified diff