Changeset 6996 for trunk/prototype/modules/calendar/templates/index.ejs

Timestamp:

08/10/12 19:11:37 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Merge de novas funcionalidades com trunk #2951, #2952

File:

• trunk/prototype/modules/calendar/templates/index.ejs (modified) (9 diffs)

trunk/prototype/modules/calendar/templates/index.ejs

@@ -27 +27 @@
 <link rel="Stylesheet" type="text/css" href="<?= PLUGINSURL ?>/timepicker/jquery-ui-timepicker-addon.css" />
 <link rel="stylesheet" type="text/css" href='<?= PLUGINSURL ?>/zebradialog/css/zebra_dialog.css'></link>
+<link rel="stylesheet" type="text/css" href='<?= PLUGINSURL ?>/jquery.spinner/jquery.spinner.css'></link>
 
 <link rel="stylesheet" type="text/css" href="<?= MODULESURL ?>/css/layout.css" />
@@ -71 +72 @@
 <script type="text/javascript" src="<?= PLUGINSURL ?>/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
 <script type="text/javascript" src="<?= PLUGINSURL ?>/contextmenu/jquery.contextMenu.js"></script>
+<script type='text/javascript' src='<?= PLUGINSURL ?>/jquery.spinner/jquery.spinner.min.js'></script>
 
 <!-- JPicker -->
@@ -87 +89 @@
 
 <script type='text/javascript' src='<?= MODULESURL ?>/js/map.disponibility.js'></script>
+
+<script type='text/javascript' src='<?= MODULESURL ?>/js/activity.helpers.js'></script>
+<script type='text/javascript' src='<?= MODULESURL ?>/js/task.helpers.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.shared.js'></script>
@@ -92 +97 @@
 <script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.codecs.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/load.js'></script>     
+<script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.alarms.js'></script>  
 
 <script type='text/javascript' src='<?= MODULESURL ?>/js/I18n.js'></script>
@@ -97 +103 @@
 <script type="text/javascript" src="<?= MODULESURL ?>/js/init.js"></script>
 <script type="text/javascript" src="<?= MODULESURL ?>/js/drag_area.js"></script>
+<script type="text/javascript" src="<?= MODULESURL ?>/js/desktop.notification.js"></script>
 
 </head>
@@ -107 +114 @@
                                 <ul>
                                         <li><a href="#" onclick="add_tab_preferences();" class="menu-command configurations">Prefer&ecirc;ncias</a></li>
-                                        <li><a href="#" onclick="add_tab_configure_calendar();" class="menu-command configurations">Configura&ccedil;&atilde;o de agendas</a></li>
+                                        <li><a href="#" onclick="add_tab_configure_calendar(false, 0);" class="menu-command configurations">Configura&ccedil;&atilde;o de agendas</a></li>
+                                        <li><a href="#" onclick="add_tab_configure_calendar(false, 1);" class="menu-command configurations">Configura&ccedil;&atilde;o de grupos</a></li>
                                         <li><a href="#" onclick="show_modal_import_export(0);" class="menu-pass-through">Importar</a></li>
                                         <li><a href="#" onclick="show_modal_import_export(1);" class="menu-pass-through">Exportar</a></li>
@@ -120 +128 @@
                 <div class="block-vertical-toolbox">
                         <a class="button add add-event" href="#">Adicionar evento</a>
+                        <a class="button add add-task" href="#">Adicionar tarefa</a>
+                        <a class="button add add-activity" href="#">Adicionar atividade</a>
                         <!--<a class="button add" href="#" onclick="add_events_list();">Lista de Eventos</a>-->
                         <div class="mini-calendar"></div>
@@ -131 +141 @@
                         <ul>
                                 <li><a href="#calendar">Agenda</a></li>
-                                <li><a href="#tab_events_list_" onclick="add_events_list();">Lista de Eventos</a></li>
+                                <li><a href="#tab_events_list_" onclick="add_events_list(false, 0);">Lista de Eventos</a></li>
+                                <li><a href="#tab_tasks_list_" onclick="add_events_list(false, 1);">Lista de Tarefas</a></li>
                                 <!--<li><a href="#sandbox2">Sandbox</a></li>-->
                         </ul>
                         <div id="calendar"> </div>
                         <div id="tab_events_list_"> </div>
+                        <div id="tab_tasks_list_"> </div>
                         <div id="sandbox2">     </div>
                         <div id="calendarShared">       </div>
@@ -147 +159 @@
         </div>
 </body>
-
 </html>
-