Project

General

Profile

Revision 367be1e7

ID367be1e71c16df65557b397764c46fa5617dc9ea
Parent 3af895d3
Child b726cd6f

Added by Thomas ANDREJAK almost 15 years ago

Ajout d'un lien, rétablissement du fonctionnement lors de l'accès aux pages 2, 3, etc, ajout de possibilités pour les URLs de l'historique

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

View differences:

vigiboard/controllers/root.py
55 55
            error_handler=process_form_errors)
56 56
    @expose('vigiboard.templates.vigiboard')
57 57
    @require(Any(not_anonymous(), msg="You need to be authenticated"))
58
    def index(self, page = 1, host = None, service = None, output = None,
59
            trouble_ticket=None):
58
    def default(self, page = 1, host = None, service = None, output = None,
59
            trouble_ticket=None,*argv,**krgv):
60 60
            
61 61
        """
62 62
        Page d'accueil de Vigiboard. Elle affiche, suivant la page demandée (page 1 par
......
154 154
                host = events.hostname,
155 155
                service = events.servicename,
156 156
                nagios_link = tg.config['vigiboard_links.nagios'] % \
157
                        {'idevent': events.idevent},
157
                        {'idevent': events.idevent,'host': events.hostname, 'service': events.servicename},
158 158
                metrology_link = tg.config['vigiboard_links.metrology'] % \
159
                        {'idevent': events.idevent},
159
                        {'idevent': events.idevent,'host': events.hostname, 'service': events.servicename},
160 160
                security_link = tg.config['vigiboard_links.security'] % \
161
                        {'idevent': events.idevent},
161
                        {'idevent': events.idevent,'host': events.hostname, 'service': events.servicename},
162 162
                servicetype_link = tg.config['vigiboard_links.servicetype'] % \
163
                        {'idevent': events.idevent}
163
                        {'idevent': events.idevent,'host': events.hostname, 'service': events.servicename}
164 164
            )
165 165

  
166 166
    @validate(validators={'idevent':validators.Int(not_empty=True)},
vigiboard/controllers/vigiboard_controller.py
46 46
#            except:
47 47
#                pass
48 48

  
49
    @expose('vigiboard.templates.index')
50
    def index(self):
51
        """Handle the front-page."""
52
        return dict(page='index')
53

  
54
    @expose('vigiboard.templates.about')
55
    def about(self):
56
        """Handle the 'about' page."""
57
        return dict(page='about')
49
#    @expose('vigiboard.templates.index')
50
#    def index(self):
51
#        """Handle the front-page."""
52
#        return dict(page='index')
53
#
54
#    @expose('vigiboard.templates.about')
55
#    def about(self):
56
#        """Handle the 'about' page."""
57
#        return dict(page='about')
58 58

  
59 59
    @expose('vigiboard.templates.authentication')
60 60
    def auth(self):
vigiboard/templates/vigiboard_event_table.html
5 5
<py:def function="event_table(events,page,pages,id_first_row,id_last_row,total_row,edit_event_status_options)">
6 6
<?python from genshi import HTML ?>
7 7

  
8
<div style="text-align: right">
8
<div style="text-align: right; margin-bottom: 10px">
9
	<a href="${tg.url('/')}">Accueil</a>
9 10
	<a id="SearchLien" href="javascript:vigiboard_searchdialog()">
10 11
	<img src="${tg.url('/images/filter.png')}" />
11 12
	</a>
......
43 44
		<tr py:attrs="class_tr">
44 45
			<td py:attrs="class_td_severity"><a href="javascript:vigiboard_historydialog('${event.idevent}')" class="HistoryLien"><img src="${tg.url(img_fleche['src'])}" style="width:20px"/></a></td>
45 46
			<td py:attrs="class_td_date">${event.get_date('timestamp_active')}<br />[${event.get_since_date('timestamp_active')}]</td>
46
			<td py:attrs="class_td_date">${event.occurence}</td>
47
			<td py:attrs="class_td_date" style="text-align:center">${event.occurence}</td>
47 48
			<td>${event.hostname}</td>
48 49
			<td>${event.servicename}</td>
49 50
			<td>${event.output}</td>

Also available in: Unified diff