Project

General

Profile

Revision e67dff20

IDe67dff204b553e0fb8161d0ca6793716ece6396e
Parent 8dcc834f
Child 0645820e

Added by Aurelien BOMPARD about 14 years ago

RRDGraph -> VigiRRD

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

View differences:

javascript/source/class/vigigraph/Application.js
187 187
        return index_l;
188 188
      }
189 189

  
190
      function tempoFire(Delay)
191
      {
192
        var a = setTimeout(tempoFall, Delay);
193
      }
194

  
195
      function tempoFall()
196
      {
197
        if ( w2 != undefined)
198
        {
199
          w2.close();
200
        }
201
      }
202

  
203 190
      // Buttons
204 191
      bp = document.getElementById('print');
205 192
      /// @XXX le addEventListener est ici celui du DOM (pas celui de qooxdoo)
......
207 194
      /// la compatibilité avec les navigateurs n'ayant pas addEventListener
208 195
      /// (ie: Internet Explorer).
209 196
      bp.addEventListener("click",function(e) {
210
        var nb = document.images.length;
211

  
212
        // liste src
213
        var index_p = -1;
214
        var src_l = "";
215
        var src_tab = new Array;
216
        var j = 0;
217
        for (i = 0; i < nb; i++)
218
        {
219
          src_l = document.images[i].src;
220 197

  
221
          // graphe rrd ?
222
          pos = src_l.indexOf("/rrdgraph.py");
223
          if (pos != -1)
224
          {
225
            src_tab[j] = encodeURIComponent(src_l);
226
            j += 1; 
198
        var graph_imgs = [];
199
        var images = document.getElementsByTagName("img");
200
        for (var i=0 ; i < images.length ; i++) {
201
          if (images[i].parentNode.className == "graph") {
202
            graph_imgs.push(images[i].src);
227 203
          }
228 204
        }
205
        var print_url = urls.graphsList + "?";
206
        for (var i=0 ; i < graph_imgs.length ; i++) {
207
          if (i != 0) print_url += "&";
208
          print_url += i + "=" + encodeURIComponent(graph_imgs[i]);
209
        }
229 210

  
230
        // impression à partir nouvelle fenêtre
231
        var lh = src_tab.length;
232
        if (lh > 0)
233
        {
234
          var url = urls.graphsList;
235
          url += "?";
236
          for (i = 0; i < lh; i++)
237
          {
238
            if (i > 0)
239
            {
240
              url += "&";
241
            }
242
            url += i;
243
            url += "=";
244
            url += src_tab[i];
245
          }
246

  
247
          w2 = window.open(url);
248
          w2.onload = function(){
249
            w2.print();
250
            wDelay = 1000;
251
            tempoFire(wDelay);
252
          }
211
        w2 = window.open(print_url);
212
        w2.onload = function(){
213
          w2.print();
253 214
        }
254 215
        e.stopPropagation();
255 216
        e.preventDefault();
......
691 652

  
692 653
      function setUrl(start,duration)
693 654
      {
694
        url= urls.getImage+"/"+encodeURIComponent(host)+"/rrdgraph.py?start="+start+"&duration="+duration+"&graphtemplate="+encodeURIComponent(graph)+"&host="+encodeURIComponent(host)+"&direct=1";
655
        url= urls.getImage+"/"+encodeURIComponent(host)+"/graph.png?start="+start+"&duration="+duration+"&graphtemplate="+encodeURIComponent(graph)+"&host="+encodeURIComponent(host);
695 656
        qx.log.Logger.ROOT_LOGGER.debug(url);
696 657
      }
697 658
      function loadImage(myUrl,o)
698 659
      {
699 660
        o.removeAll();
700
        o.add(new qx.ui.basic.Image(myUrl));
661
        var img = new qx.ui.basic.Image(myUrl);
662
        img.addEventListener("insertDom", function(e) {
663
            // Attention, la classe va être appliquée au div entourant l'image
664
            e.getTarget().getElement().className = "graph";
665
        });
666
        o.add(img);
701 667
      }
702 668
      function getTime() // we use a function because the window can be opened a long time without reloading
703 669
      {
......
706 672
      }
707 673
      function updateGraphOnStartTime()
708 674
      {
709
        var url= urls.getStartTime+"/"+encodeURIComponent(host)+"/rrdgraph.py?getstarttime=1&host="+encodeURIComponent(host);
710
        var g=new qx.io.remote.Request(url,"GET","text/plain");
675
        var url= urls.getStartTime+"/"+encodeURIComponent(host)+"/starttime?host="+encodeURIComponent(host);
676
        var g=new qx.io.remote.Request(url,"GET","application/json");
711 677
        g.addEventListener("completed", function(e) { 
712
          start = parseInt(e.getContent());
678
          start = parseInt(e.getContent().starttime);
713 679
          setStep(start);
714 680
          bt_first.setEnabled(false); 
715 681
          bt_prev.setEnabled(false);
......
785 751
      }
786 752
      function getIndicators(graph)
787 753
      {
754
        function addExportButton(label, ds) {
755
          var menu_bt = new qx.ui.menu.Button(label);
756
          menu_bt.title = label
757
          menu_bt.addEventListener("execute",function(e) { getExport(ds); });
758
          indicator_menu.add(menu_bt);
759
        }
788 760
        var url= urls.getIndicators+"?graph="+graph;
789 761
        var r = new qx.io.remote.Request(url,"GET","application/json");
790 762
        r.addEventListener("completed", function(e) { 
791 763
          r = e.getContent().items;
792
          var txt = "";
793
          for(var i = 0; i <= r.length; i++)
764
          for(var i = 0; i < r.length; i++)
794 765
          {
795
            txt = "All";
796
            if (i < r.length)
797
            {
798
              txt = r[i][0];
799
            }
800
            var menu_bt = new qx.ui.menu.Button(txt);
801
            menu_bt.title = txt
802
            menu_bt.addEventListener("execute",function(e) { getExport(this.title); });
803
            indicator_menu.add(menu_bt);
766
            // on pourrait vouloir traduire les indicateurs un jour, donc deux arguments...
767
            addExportButton(r[i], r[i]);
804 768
          }
769
          addExportButton(this.tr("All"), null);
805 770
        });
806 771
        r.send();
807 772
      }
......
840 805
      bt_print.addEventListener("execute",function(e) {
841 806
        var w3 = undefined;
842 807

  
843
        function tempoFirePrint(Delay)
844
        {
845
          var a = setTimeout(tempoFallPrint, Delay);
846
        }
847

  
848
        function tempoFallPrint()
849
        {
850
          if ( w3 != undefined)
851
          {
852
            w3.close();
808
        var win = e.getTarget().getElement().parentNode.parentNode.parentNode;
809
        var images = win.getElementsByTagName("img");
810
        var src = null;
811
        for (var i=0 ; i < images.length ; i++) {
812
          if (images[i].parentNode.className != "graph") {
813
            continue;
853 814
          }
815
          src = images[i].src
854 816
        }
855

  
856
        var nb = document.images.length;
857

  
858
        // liste src
859
        var index_p = -1;
860
        var src_l = "";
861
        var src_tab = new Array;
862
        var j = 0;
863
        for (i = 0; i < nb; i++)
864
        {
865
          src_l = document.images[i].src;
866

  
867
          // correspondance selon parametres ?
868
          pos = src_l.indexOf("/rrdgraph.py");
869
          if (pos != -1)
870
          {
871
            pos = src_l.indexOf(host);
872
            if (pos != -1)
873
            {
874
              var graph_l = graph;
875
              var sc = " ";
876
              var rc = "+";
877
              while (graph_l.indexOf(sc) > 0)
878
              {
879
                graph_l = graph_l.replace(sc, rc);
880
              }
881

  
882
              var src_d = decodeURIComponent(src_l);
883
              pos = src_d.indexOf(graph_l);
884
            }
885
            if (pos != -1)
886
            {
887
              pos = src_l.indexOf(start);
888
            }
889
            if (pos != -1)
890
            {
891
              pos = src_l.indexOf(duration);
892
            }
893
            if (pos != -1)
894
            {
895
              src_tab[j] = encodeURIComponent(src_l);
896
              j += 1; 
897
            }
898
          }
899
        }
900

  
901
        // impression à partir nouvelle fenêtre
902
        var lh = src_tab.length;
903
        if (lh > 0)
904
        {
905
          var url = urls.graphsList;
906
          url += "?";
907
          for (i = 0; i < lh; i++)
908
          {
909
            if (i > 0)
910
            {
911
              url += "&";
912
            }
913
            url += i;
914
            url += "=";
915
            url += src_tab[i];
916
          }
917

  
918
          w3 = window.open(url);
919
          w3.onload = function(){
920
            w3.print();
921
            wDelay = 1000;
922
            tempoFirePrint(wDelay);
923
          }
817
        var print_url = urls.graphsList + "?1=" + encodeURIComponent(src);
818
        w3 = window.open(print_url);
819
        w3.onload = function(){
820
          w3.print();
924 821
        }
925 822
      });
926 823

  
......
1005 902
        if (indicator != "")
1006 903
        {
1007 904
          var end = start + duration;
1008
          var url= urls.exportCSV+"/"+encodeURIComponent(host)+"/rrdgraph.py/exportCSV?host="+encodeURIComponent(host)+"&graphtemplate="+encodeURIComponent(graph)+"&ds="+encodeURIComponent(indicator)+"&start="+start+"&end="+end;
905
          // @XXX: puisqu'on exporte soit tout le graphe soit un indicateur à
906
          // la fois, on ne devrait pas avoir besoin de fournir le
907
          // graphtemplate si on spécifie un ds.
908
          var url= urls.exportCSV+"/"+encodeURIComponent(host)+"/export.csv?"
909
                    +"host="+encodeURIComponent(host)
910
                    +"&graphtemplate="+encodeURIComponent(graph)
911
                    +"&start="+start+"&end="+end;
912
          if (indicator) {
913
            url += "&ds="+encodeURIComponent(indicator);
914
          }
1009 915
          w4 = window.open(url);
1010 916
          w4.onload = function(){
1011 917
          }
javascript/source/translation/C.po
7 7
msgstr ""
8 8
"Project-Id-Version: VigiGraph 1.0\n"
9 9
"Report-Msgid-Bugs-To: \n"
10
"POT-Creation-Date: 2010-04-23 13:14+0200\n"
10
"POT-Creation-Date: 2010-04-30 17:14+0200\n"
11 11
"PO-Revision-Date: 2007-12-06 16:03+0100\n"
12 12
"Last-Translator: Automatically generated\n"
13 13
"Language-Team: none\n"
......
48 48
msgstr "Refresh"
49 49

  
50 50
#: source/class/vigigraph/Application.js:142
51
#: source/class/vigigraph/Application.js:274
51
#: source/class/vigigraph/Application.js:235
52 52
msgid "Search"
53 53
msgstr "Search"
54 54

  
......
60 60
msgid "Show graph"
61 61
msgstr "Show graph"
62 62

  
63
#: source/class/vigigraph/Application.js:291
63
#: source/class/vigigraph/Application.js:252
64 64
msgid "Host:"
65 65
msgstr "Host:"
66 66

  
67
#: source/class/vigigraph/Application.js:297
67
#: source/class/vigigraph/Application.js:258
68 68
msgid "Search for a host (\"*\" for all, 100 max)"
69 69
msgstr "Search for a host (\"*\" for all, 100 max)"
70 70

  
71
#: source/class/vigigraph/Application.js:298
71
#: source/class/vigigraph/Application.js:259
72 72
msgid "Graph:"
73 73
msgstr "Graph:"
74 74

  
75
#: source/class/vigigraph/Application.js:304
75
#: source/class/vigigraph/Application.js:265
76 76
msgid "Search for a graph (\"*\" for all, 100 max)"
77 77
msgstr "Search for a graph (\"*\" for all, 100 max)"
78 78

  
79
#: source/class/vigigraph/Application.js:310
79
#: source/class/vigigraph/Application.js:271
80 80
msgid "Graph"
81 81
msgstr "Graph"
82 82

  
83
#: source/class/vigigraph/Application.js:310
83
#: source/class/vigigraph/Application.js:271
84 84
msgid "Host"
85 85
msgstr "Host"
86 86

  
87
#: source/class/vigigraph/Application.js:636
87
#: source/class/vigigraph/Application.js:597
88 88
msgid "\"%1\" Graph for host %2"
89 89
msgstr "\"%1\" Graph for host %2"
90 90

  
91
#: source/class/vigigraph/Application.js:641
91
#: source/class/vigigraph/Application.js:602
92 92
msgid "Reload graph"
93 93
msgstr "Reload graph"
94 94

  
95
#: source/class/vigigraph/Application.js:646
95
#: source/class/vigigraph/Application.js:607
96 96
msgid "Last 12 hours"
97 97
msgstr "Last 12 hours"
98 98

  
99
#: source/class/vigigraph/Application.js:647
99
#: source/class/vigigraph/Application.js:608
100 100
msgid "Last 24 hours"
101 101
msgstr "Last 24 hours"
102 102

  
103
#: source/class/vigigraph/Application.js:648
103
#: source/class/vigigraph/Application.js:609
104 104
msgid "Last 48 hours"
105 105
msgstr "Last 48 hours"
106 106

  
107
#: source/class/vigigraph/Application.js:649
107
#: source/class/vigigraph/Application.js:610
108 108
msgid "Last 7 days"
109 109
msgstr "Last 7 days"
110 110

  
111
#: source/class/vigigraph/Application.js:650
111
#: source/class/vigigraph/Application.js:611
112 112
msgid "Last 14 days"
113 113
msgstr "Last 14 days"
114 114

  
115
#: source/class/vigigraph/Application.js:651
115
#: source/class/vigigraph/Application.js:612
116 116
msgid "Last 3 months"
117 117
msgstr "Last 3 months"
118 118

  
119
#: source/class/vigigraph/Application.js:652
119
#: source/class/vigigraph/Application.js:613
120 120
msgid "Last 6 months"
121 121
msgstr "Last 6 months"
122 122

  
123
#: source/class/vigigraph/Application.js:653
123
#: source/class/vigigraph/Application.js:614
124 124
msgid "Last year"
125 125
msgstr "Last year"
126 126

  
127
#: source/class/vigigraph/Application.js:662
127
#: source/class/vigigraph/Application.js:623
128 128
msgid "Timeframe"
129 129
msgstr "Timeframe"
130 130

  
131
#: source/class/vigigraph/Application.js:663
131
#: source/class/vigigraph/Application.js:624
132 132
msgid "Timeframe menu"
133 133
msgstr "Timeframe menu"
134 134

  
135
#: source/class/vigigraph/Application.js:666
135
#: source/class/vigigraph/Application.js:627
136 136
msgid "Graph start"
137 137
msgstr "Graph start"
138 138

  
139
#: source/class/vigigraph/Application.js:668
139
#: source/class/vigigraph/Application.js:629
140 140
msgid "Last section"
141 141
msgstr "Last section"
142 142

  
143
#: source/class/vigigraph/Application.js:670
143
#: source/class/vigigraph/Application.js:631
144 144
msgid "Next section"
145 145
msgstr "Next section"
146 146

  
147
#: source/class/vigigraph/Application.js:672
147
#: source/class/vigigraph/Application.js:633
148 148
msgid "Graph end"
149 149
msgstr "Graph end"
150 150

  
151
#: source/class/vigigraph/Application.js:674
151
#: source/class/vigigraph/Application.js:635
152 152
msgid "Zoom in"
153 153
msgstr "Zoom in"
154 154

  
155
#: source/class/vigigraph/Application.js:676
155
#: source/class/vigigraph/Application.js:637
156 156
msgid "Zoom out"
157 157
msgstr "Zoom out"
158 158

  
159
#: source/class/vigigraph/Application.js:678
159
#: source/class/vigigraph/Application.js:639
160 160
msgid "Print Graph"
161 161
msgstr "Print Graph"
162 162

  
163
#: source/class/vigigraph/Application.js:684
164
#: source/class/vigigraph/Application.js:685
163
#: source/class/vigigraph/Application.js:645
164
#: source/class/vigigraph/Application.js:646
165 165
msgid "Export CSV"
166 166
msgstr "Export CSV"
167 167

  
168
#: source/class/vigigraph/Application.js:769
169
msgid "All"
170
msgstr ""
javascript/source/translation/en.po
7 7
msgstr ""
8 8
"Project-Id-Version: VigiGraph 1.0\n"
9 9
"Report-Msgid-Bugs-To: \n"
10
"POT-Creation-Date: 2010-04-23 13:14+0200\n"
10
"POT-Creation-Date: 2010-04-30 17:14+0200\n"
11 11
"PO-Revision-Date: 2010-04-23 13:12+0200\n"
12 12
"Last-Translator: Automatically generated\n"
13 13
"Language-Team: none\n"
......
49 49
msgstr "Refresh"
50 50

  
51 51
#: source/class/vigigraph/Application.js:142
52
#: source/class/vigigraph/Application.js:274
52
#: source/class/vigigraph/Application.js:235
53 53
msgid "Search"
54 54
msgstr "Search"
55 55

  
......
61 61
msgid "Show graph"
62 62
msgstr "Show graph"
63 63

  
64
#: source/class/vigigraph/Application.js:291
64
#: source/class/vigigraph/Application.js:252
65 65
msgid "Host:"
66 66
msgstr "Host:"
67 67

  
68
#: source/class/vigigraph/Application.js:297
68
#: source/class/vigigraph/Application.js:258
69 69
msgid "Search for a host (\"*\" for all, 100 max)"
70 70
msgstr "Search for a host (\"*\" for all, 100 max)"
71 71

  
72
#: source/class/vigigraph/Application.js:298
72
#: source/class/vigigraph/Application.js:259
73 73
msgid "Graph:"
74 74
msgstr "Graph:"
75 75

  
76
#: source/class/vigigraph/Application.js:304
76
#: source/class/vigigraph/Application.js:265
77 77
msgid "Search for a graph (\"*\" for all, 100 max)"
78 78
msgstr "Search for a graph (\"*\" for all, 100 max)"
79 79

  
80
#: source/class/vigigraph/Application.js:310
80
#: source/class/vigigraph/Application.js:271
81 81
msgid "Graph"
82 82
msgstr "Graph"
83 83

  
84
#: source/class/vigigraph/Application.js:310
84
#: source/class/vigigraph/Application.js:271
85 85
msgid "Host"
86 86
msgstr "Host"
87 87

  
88
#: source/class/vigigraph/Application.js:636
88
#: source/class/vigigraph/Application.js:597
89 89
msgid "\"%1\" Graph for host %2"
90 90
msgstr "\"%1\" Graph for host %2"
91 91

  
92
#: source/class/vigigraph/Application.js:641
92
#: source/class/vigigraph/Application.js:602
93 93
msgid "Reload graph"
94 94
msgstr "Reload graph"
95 95

  
96
#: source/class/vigigraph/Application.js:646
96
#: source/class/vigigraph/Application.js:607
97 97
msgid "Last 12 hours"
98 98
msgstr "Last 12 hours"
99 99

  
100
#: source/class/vigigraph/Application.js:647
100
#: source/class/vigigraph/Application.js:608
101 101
msgid "Last 24 hours"
102 102
msgstr "Last 24 hours"
103 103

  
104
#: source/class/vigigraph/Application.js:648
104
#: source/class/vigigraph/Application.js:609
105 105
msgid "Last 48 hours"
106 106
msgstr "Last 48 hours"
107 107

  
108
#: source/class/vigigraph/Application.js:649
108
#: source/class/vigigraph/Application.js:610
109 109
msgid "Last 7 days"
110 110
msgstr "Last 7 days"
111 111

  
112
#: source/class/vigigraph/Application.js:650
112
#: source/class/vigigraph/Application.js:611
113 113
msgid "Last 14 days"
114 114
msgstr "Last 14 days"
115 115

  
116
#: source/class/vigigraph/Application.js:651
116
#: source/class/vigigraph/Application.js:612
117 117
msgid "Last 3 months"
118 118
msgstr "Last 3 months"
119 119

  
120
#: source/class/vigigraph/Application.js:652
120
#: source/class/vigigraph/Application.js:613
121 121
msgid "Last 6 months"
122 122
msgstr "Last 6 months"
123 123

  
124
#: source/class/vigigraph/Application.js:653
124
#: source/class/vigigraph/Application.js:614
125 125
msgid "Last year"
126 126
msgstr "Last year"
127 127

  
128
#: source/class/vigigraph/Application.js:662
128
#: source/class/vigigraph/Application.js:623
129 129
msgid "Timeframe"
130 130
msgstr "Timeframe"
131 131

  
132
#: source/class/vigigraph/Application.js:663
132
#: source/class/vigigraph/Application.js:624
133 133
msgid "Timeframe menu"
134 134
msgstr "Timeframe menu"
135 135

  
136
#: source/class/vigigraph/Application.js:666
136
#: source/class/vigigraph/Application.js:627
137 137
msgid "Graph start"
138 138
msgstr "Graph start"
139 139

  
140
#: source/class/vigigraph/Application.js:668
140
#: source/class/vigigraph/Application.js:629
141 141
msgid "Last section"
142 142
msgstr "Last section"
143 143

  
144
#: source/class/vigigraph/Application.js:670
144
#: source/class/vigigraph/Application.js:631
145 145
msgid "Next section"
146 146
msgstr "Next section"
147 147

  
148
#: source/class/vigigraph/Application.js:672
148
#: source/class/vigigraph/Application.js:633
149 149
msgid "Graph end"
150 150
msgstr "Graph end"
151 151

  
152
#: source/class/vigigraph/Application.js:674
152
#: source/class/vigigraph/Application.js:635
153 153
msgid "Zoom in"
154 154
msgstr "Zoom in"
155 155

  
156
#: source/class/vigigraph/Application.js:676
156
#: source/class/vigigraph/Application.js:637
157 157
msgid "Zoom out"
158 158
msgstr "Zoom out"
159 159

  
160
#: source/class/vigigraph/Application.js:678
160
#: source/class/vigigraph/Application.js:639
161 161
msgid "Print Graph"
162 162
msgstr "Print Graph"
163 163

  
164
#: source/class/vigigraph/Application.js:684
165
#: source/class/vigigraph/Application.js:685
164
#: source/class/vigigraph/Application.js:645
165
#: source/class/vigigraph/Application.js:646
166 166
msgid "Export CSV"
167 167
msgstr "Export CSV"
168 168

  
169
#: source/class/vigigraph/Application.js:769
170
msgid "All"
171
msgstr ""
javascript/source/translation/fr.po
7 7
msgstr ""
8 8
"Project-Id-Version: VigiGraph 1.0\n"
9 9
"Report-Msgid-Bugs-To: \n"
10
"POT-Creation-Date: 2010-04-23 13:14+0200\n"
10
"POT-Creation-Date: 2010-04-30 17:14+0200\n"
11 11
"PO-Revision-Date: 2007-12-06 16:03+0100\n"
12 12
"Last-Translator: Automatically generated\n"
13 13
"Language-Team: none\n"
......
49 49
msgstr "Rafraîchir"
50 50

  
51 51
#: source/class/vigigraph/Application.js:142
52
#: source/class/vigigraph/Application.js:274
52
#: source/class/vigigraph/Application.js:235
53 53
msgid "Search"
54 54
msgstr "Chercher"
55 55

  
......
61 61
msgid "Show graph"
62 62
msgstr "Voir le graphe"
63 63

  
64
#: source/class/vigigraph/Application.js:291
64
#: source/class/vigigraph/Application.js:252
65 65
msgid "Host:"
66 66
msgstr "Hôte :"
67 67

  
68
#: source/class/vigigraph/Application.js:297
68
#: source/class/vigigraph/Application.js:258
69 69
msgid "Search for a host (\"*\" for all, 100 max)"
70 70
msgstr "Chercher un hôte (\"*\" pour tous, 100 maximum)"
71 71

  
72
#: source/class/vigigraph/Application.js:298
72
#: source/class/vigigraph/Application.js:259
73 73
msgid "Graph:"
74 74
msgstr "Graphe :"
75 75

  
76
#: source/class/vigigraph/Application.js:304
76
#: source/class/vigigraph/Application.js:265
77 77
msgid "Search for a graph (\"*\" for all, 100 max)"
78 78
msgstr "Chercher un graphe (\"*\" pour tous, 100 maximum)"
79 79

  
80
#: source/class/vigigraph/Application.js:310
80
#: source/class/vigigraph/Application.js:271
81 81
msgid "Graph"
82 82
msgstr "Graphe"
83 83

  
84
#: source/class/vigigraph/Application.js:310
84
#: source/class/vigigraph/Application.js:271
85 85
msgid "Host"
86 86
msgstr "Hôte"
87 87

  
88
#: source/class/vigigraph/Application.js:636
88
#: source/class/vigigraph/Application.js:597
89 89
msgid "\"%1\" Graph for host %2"
90 90
msgstr "Graphe \"%1\" pour l'hôte %2"
91 91

  
92
#: source/class/vigigraph/Application.js:641
92
#: source/class/vigigraph/Application.js:602
93 93
msgid "Reload graph"
94 94
msgstr "Recharger le graphe"
95 95

  
96
#: source/class/vigigraph/Application.js:646
96
#: source/class/vigigraph/Application.js:607
97 97
msgid "Last 12 hours"
98 98
msgstr "12 dernières heures"
99 99

  
100
#: source/class/vigigraph/Application.js:647
100
#: source/class/vigigraph/Application.js:608
101 101
msgid "Last 24 hours"
102 102
msgstr "24 dernières heures"
103 103

  
104
#: source/class/vigigraph/Application.js:648
104
#: source/class/vigigraph/Application.js:609
105 105
msgid "Last 48 hours"
106 106
msgstr "48 dernières heures"
107 107

  
108
#: source/class/vigigraph/Application.js:649
108
#: source/class/vigigraph/Application.js:610
109 109
msgid "Last 7 days"
110 110
msgstr "7 derniers jours"
111 111

  
112
#: source/class/vigigraph/Application.js:650
112
#: source/class/vigigraph/Application.js:611
113 113
msgid "Last 14 days"
114 114
msgstr "14 derniers jours"
115 115

  
116
#: source/class/vigigraph/Application.js:651
116
#: source/class/vigigraph/Application.js:612
117 117
msgid "Last 3 months"
118 118
msgstr "3 derniers mois"
119 119

  
120
#: source/class/vigigraph/Application.js:652
120
#: source/class/vigigraph/Application.js:613
121 121
msgid "Last 6 months"
122 122
msgstr "6 derniers mois"
123 123

  
124
#: source/class/vigigraph/Application.js:653
124
#: source/class/vigigraph/Application.js:614
125 125
msgid "Last year"
126 126
msgstr "Dernière année"
127 127

  
128
#: source/class/vigigraph/Application.js:662
128
#: source/class/vigigraph/Application.js:623
129 129
msgid "Timeframe"
130 130
msgstr "Période"
131 131

  
132
#: source/class/vigigraph/Application.js:663
132
#: source/class/vigigraph/Application.js:624
133 133
msgid "Timeframe menu"
134 134
msgstr "Menu de choix de la période"
135 135

  
136
#: source/class/vigigraph/Application.js:666
136
#: source/class/vigigraph/Application.js:627
137 137
msgid "Graph start"
138 138
msgstr "Début du graphe"
139 139

  
140
#: source/class/vigigraph/Application.js:668
140
#: source/class/vigigraph/Application.js:629
141 141
msgid "Last section"
142 142
msgstr "Dernière section"
143 143

  
144
#: source/class/vigigraph/Application.js:670
144
#: source/class/vigigraph/Application.js:631
145 145
msgid "Next section"
146 146
msgstr "Section suivante"
147 147

  
148
#: source/class/vigigraph/Application.js:672
148
#: source/class/vigigraph/Application.js:633
149 149
msgid "Graph end"
150 150
msgstr "Fin du graphe"
151 151

  
152
#: source/class/vigigraph/Application.js:674
152
#: source/class/vigigraph/Application.js:635
153 153
msgid "Zoom in"
154 154
msgstr "Zoomer"
155 155

  
156
#: source/class/vigigraph/Application.js:676
156
#: source/class/vigigraph/Application.js:637
157 157
msgid "Zoom out"
158 158
msgstr "Dézoomer"
159 159

  
160
#: source/class/vigigraph/Application.js:678
160
#: source/class/vigigraph/Application.js:639
161 161
msgid "Print Graph"
162 162
msgstr "Imprimer le graphe"
163 163

  
164
#: source/class/vigigraph/Application.js:684
165
#: source/class/vigigraph/Application.js:685
164
#: source/class/vigigraph/Application.js:645
165
#: source/class/vigigraph/Application.js:646
166 166
msgid "Export CSV"
167 167
msgstr "Export CSV"
168 168

  
169
#: source/class/vigigraph/Application.js:769
170
msgid "All"
171
msgstr "Tous"
javascript/source/translation/messages.pot
8 8
msgstr ""
9 9
"Project-Id-Version: PACKAGE VERSION\n"
10 10
"Report-Msgid-Bugs-To: \n"
11
"POT-Creation-Date: 2010-04-23 13:14+0200\n"
11
"POT-Creation-Date: 2010-04-30 17:14+0200\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"
......
49 49
msgstr ""
50 50

  
51 51
#: source/class/vigigraph/Application.js:142
52
#: source/class/vigigraph/Application.js:274
52
#: source/class/vigigraph/Application.js:235
53 53
msgid "Search"
54 54
msgstr ""
55 55

  
......
61 61
msgid "Show graph"
62 62
msgstr ""
63 63

  
64
#: source/class/vigigraph/Application.js:291
64
#: source/class/vigigraph/Application.js:252
65 65
msgid "Host:"
66 66
msgstr ""
67 67

  
68
#: source/class/vigigraph/Application.js:297
68
#: source/class/vigigraph/Application.js:258
69 69
msgid "Search for a host (\"*\" for all, 100 max)"
70 70
msgstr ""
71 71

  
72
#: source/class/vigigraph/Application.js:298
72
#: source/class/vigigraph/Application.js:259
73 73
msgid "Graph:"
74 74
msgstr ""
75 75

  
76
#: source/class/vigigraph/Application.js:304
76
#: source/class/vigigraph/Application.js:265
77 77
msgid "Search for a graph (\"*\" for all, 100 max)"
78 78
msgstr ""
79 79

  
80
#: source/class/vigigraph/Application.js:310
80
#: source/class/vigigraph/Application.js:271
81 81
msgid "Graph"
82 82
msgstr ""
83 83

  
84
#: source/class/vigigraph/Application.js:310
84
#: source/class/vigigraph/Application.js:271
85 85
msgid "Host"
86 86
msgstr ""
87 87

  
88
#: source/class/vigigraph/Application.js:636
88
#: source/class/vigigraph/Application.js:597
89 89
msgid "\"%1\" Graph for host %2"
90 90
msgstr ""
91 91

  
92
#: source/class/vigigraph/Application.js:641
92
#: source/class/vigigraph/Application.js:602
93 93
msgid "Reload graph"
94 94
msgstr ""
95 95

  
96
#: source/class/vigigraph/Application.js:646
96
#: source/class/vigigraph/Application.js:607
97 97
msgid "Last 12 hours"
98 98
msgstr ""
99 99

  
100
#: source/class/vigigraph/Application.js:647
100
#: source/class/vigigraph/Application.js:608
101 101
msgid "Last 24 hours"
102 102
msgstr ""
103 103

  
104
#: source/class/vigigraph/Application.js:648
104
#: source/class/vigigraph/Application.js:609
105 105
msgid "Last 48 hours"
106 106
msgstr ""
107 107

  
108
#: source/class/vigigraph/Application.js:649
108
#: source/class/vigigraph/Application.js:610
109 109
msgid "Last 7 days"
110 110
msgstr ""
111 111

  
112
#: source/class/vigigraph/Application.js:650
112
#: source/class/vigigraph/Application.js:611
113 113
msgid "Last 14 days"
114 114
msgstr ""
115 115

  
116
#: source/class/vigigraph/Application.js:651
116
#: source/class/vigigraph/Application.js:612
117 117
msgid "Last 3 months"
118 118
msgstr ""
119 119

  
120
#: source/class/vigigraph/Application.js:652
120
#: source/class/vigigraph/Application.js:613
121 121
msgid "Last 6 months"
122 122
msgstr ""
123 123

  
124
#: source/class/vigigraph/Application.js:653
124
#: source/class/vigigraph/Application.js:614
125 125
msgid "Last year"
126 126
msgstr ""
127 127

  
128
#: source/class/vigigraph/Application.js:662
128
#: source/class/vigigraph/Application.js:623
129 129
msgid "Timeframe"
130 130
msgstr ""
131 131

  
132
#: source/class/vigigraph/Application.js:663
132
#: source/class/vigigraph/Application.js:624
133 133
msgid "Timeframe menu"
134 134
msgstr ""
135 135

  
136
#: source/class/vigigraph/Application.js:666
136
#: source/class/vigigraph/Application.js:627
137 137
msgid "Graph start"
138 138
msgstr ""
139 139

  
140
#: source/class/vigigraph/Application.js:668
140
#: source/class/vigigraph/Application.js:629
141 141
msgid "Last section"
142 142
msgstr ""
143 143

  
144
#: source/class/vigigraph/Application.js:670
144
#: source/class/vigigraph/Application.js:631
145 145
msgid "Next section"
146 146
msgstr ""
147 147

  
148
#: source/class/vigigraph/Application.js:672
148
#: source/class/vigigraph/Application.js:633
149 149
msgid "Graph end"
150 150
msgstr ""
151 151

  
152
#: source/class/vigigraph/Application.js:674
152
#: source/class/vigigraph/Application.js:635
153 153
msgid "Zoom in"
154 154
msgstr ""
155 155

  
156
#: source/class/vigigraph/Application.js:676
156
#: source/class/vigigraph/Application.js:637
157 157
msgid "Zoom out"
158 158
msgstr ""
159 159

  
160
#: source/class/vigigraph/Application.js:678
160
#: source/class/vigigraph/Application.js:639
161 161
msgid "Print Graph"
162 162
msgstr ""
163 163

  
164
#: source/class/vigigraph/Application.js:684
165
#: source/class/vigigraph/Application.js:685
164
#: source/class/vigigraph/Application.js:645
165
#: source/class/vigigraph/Application.js:646
166 166
msgid "Export CSV"
167 167
msgstr ""
168

  
169
#: source/class/vigigraph/Application.js:769
170
msgid "All"
171
msgstr ""
vigigraph/controllers/rpc.py
578 578
        """
579 579

  
580 580
        indicators = self.getListIndicators(graph)
581
        indicators = [(ind.name, ind.idperfdatasource) for ind in indicators]
581
        indicators = [ind.name for ind in indicators]
582 582
        return dict(items=indicators)
583 583

  
584 584

  
......
773 773
        indicators = []
774 774
        if graph is not None:
775 775
            indicators = DBSession.query \
776
              (PerfDataSource.name, PerfDataSource.idperfdatasource) \
776
              (PerfDataSource.name) \
777 777
              .join((GRAPH_PERFDATASOURCE_TABLE, \
778 778
              GRAPH_PERFDATASOURCE_TABLE.c.idperfdatasource == \
779 779
              PerfDataSource.idperfdatasource)) \

Also available in: Unified diff