tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2009-12-09 Raul Mateos <raulofpandora@gmail.com> 

* images/god9.png: New image.

	* include/styles/menu.css: Added style for new menu item.

	* godmode/menu.php: New menu item.

	* godmode/reporting/map_builder.php: Updated internal links and title 
	because it will be a new entry in the menu.

	* operation/visual_console/render_view.php: Updated internal link for
	setup.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2189 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-12-09 16:20:48 +00:00
parent e47997c182
commit df8d5dbf7d
6 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2009-12-09 Raul Mateos <raulofpandora@gmail.com>
* images/god9.png: New image.
* include/styles/menu.css: Added style for new menu item.
* godmode/menu.php: New menu item.
* godmode/reporting/map_builder.php: Updated internal links and title
because it will be a new entry in the menu.
* operation/visual_console/render_view.php: Updated internal link for
setup.
2009-12-09 Raul Mateos <raulofpandora@gmail.com> 2009-12-09 Raul Mateos <raulofpandora@gmail.com>
* godmode/reporting/map_builder.php: Changed H1 to H3, to maintain coherence. * godmode/reporting/map_builder.php: Changed H1 to H3, to maintain coherence.

9
pandora_console/godmode/menu.php
View File

@ -114,11 +114,14 @@ if (give_acl ($config['id_user'], 0, "IW")) {
// Custom graph builder // Custom graph builder
$sub["godmode/reporting/graphs"]["text"] = __('Graph builder'); $sub["godmode/reporting/graphs"]["text"] = __('Graph builder');
// Custom map builder
$sub["godmode/reporting/map_builder"]["text"] = __('Map builder');
$menu["greporting"]["sub"] = $sub; $menu["greporting"]["sub"] = $sub;
} }
if (give_acl ($config['id_user'], 0, "IW")) {
// Custom map builder
$menu["gmap"]["text"] = __('Map builder');
$menu["gmap"]["sec2"] = "godmode/reporting/map_builder";
$menu["gmap"]["id"] = "god-map";
}
if (give_acl ($config['id_user'], 0, "PM")) { if (give_acl ($config['id_user'], 0, "PM")) {
// Manage profiles // Manage profiles

16
pandora_console/godmode/reporting/map_builder.php
View File

@ -299,7 +299,7 @@ if ($id_layout) {
$height = $layout['height']; $height = $layout['height'];
} }
echo "<h2>".__('Reporting')." &raquo; ".__('Map builder'); echo "<h2>".__('Maps')." &raquo; ".__('Map builder');
print_help_icon ("map_builder"); print_help_icon ("map_builder");
echo "</h2>"; echo "</h2>";
@ -323,14 +323,14 @@ if (! $edit_layout && ! $id_layout) {
foreach ($maps as $map) { foreach ($maps as $map) {
if (give_acl ($config['id_user'], $map['id_group'], "AW")){ if (give_acl ($config['id_user'], $map['id_group'], "AW")){
$data = array (); $data = array ();
$data[0] = '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'">'.$map['name'].'</a>'; $data[0] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'">'.$map['name'].'</a>';
$data[1] = print_group_icon ($map['id_group'], true).'&nbsp;'; $data[1] = print_group_icon ($map['id_group'], true).'&nbsp;';
$data[1] .= get_group_name ($map['id_group']); $data[1] .= get_group_name ($map['id_group']);
$data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); $data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
$data[3] = '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder_wizard&amp;id_layout='.$map['id'].'">'.print_image ("images/pill.png", true).'</a>'; $data[3] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder_wizard&amp;id_layout='.$map['id'].'">'.print_image ("images/pill.png", true).'</a>';
$data[4] = '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1">'.print_image ("images/cross.png", true).'</a>'; $data[4] = '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1">'.print_image ("images/cross.png", true).'</a>';
array_push ($table->data, $data); array_push ($table->data, $data);
} }
} }
@ -338,7 +338,7 @@ if (! $edit_layout && ! $id_layout) {
} }
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
echo '<form action="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder" method="post">'; echo '<form action="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder" method="post">';
print_input_hidden ('edit_layout', 1); print_input_hidden ('edit_layout', 1);
print_submit_button (__('Create'), '', false, 'class="sub next"'); print_submit_button (__('Create'), '', false, 'class="sub next"');
echo '</form>'; echo '</form>';
@ -354,7 +354,7 @@ if (! $edit_layout && ! $id_layout) {
$table->data[0][1] = print_input_text ('name', $name, '', 15, 50, true); $table->data[0][1] = print_input_text ('name', $name, '', 15, 50, true);
if ($id_layout){ if ($id_layout){
$table->data[0][1] .= '&nbsp;&nbsp;<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder_wizard&amp;id_layout='.$id_layout.'">'.print_image ("images/pill.png", true).'</a>'; $table->data[0][1] .= '&nbsp;&nbsp;<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder_wizard&amp;id_layout='.$id_layout.'">'.print_image ("images/pill.png", true).'</a>';
$table->data[0][1] .= '&nbsp;&nbsp;<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr=60">'.print_image ("images/eye.png", true).'</a>'; $table->data[0][1] .= '&nbsp;&nbsp;<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr=60">'.print_image ("images/eye.png", true).'</a>';
} }
@ -370,7 +370,7 @@ if (! $edit_layout && ! $id_layout) {
$table->data[4][0] = __('Height'); $table->data[4][0] = __('Height');
$table->data[4][1] = print_input_text ('height', $height, '', 3, 5, true); $table->data[4][1] = print_input_text ('height', $height, '', 3, 5, true);
} }
echo '<form action="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder" method="post">'; echo '<form action="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder" method="post">';
print_table ($table); print_table ($table);
echo '<div style="width: '.$table->width.'" class="action-buttons">'; echo '<div style="width: '.$table->width.'" class="action-buttons">';
@ -498,7 +498,7 @@ if (! $edit_layout && ! $id_layout) {
$table->data[10][1] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != '.$id_layout, $table->data[10][1] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != '.$id_layout,
'map_linked', '', '', 'None', '', true); 'map_linked', '', '', 'None', '', true);
echo '<form id="form_layout_data_editor" method="post" action="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder" onsubmit="javascript: return testAgentCorrect();">'; echo '<form id="form_layout_data_editor" method="post" action="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder" onsubmit="javascript: return testAgentCorrect();">';
print_table ($table); print_table ($table);
print_input_hidden ('create_layout_data', 1); print_input_hidden ('create_layout_data', 1);
print_input_hidden ('update_layout_data', 0); print_input_hidden ('update_layout_data', 0);

BIN
pandora_console/images/god9.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 776 B

3
pandora_console/include/styles/menu.css
View File

@ -143,6 +143,9 @@
#icon_god-reporting { #icon_god-reporting {
background-image: url(../../images/reporting_edit.png); background-image: url(../../images/reporting_edit.png);
} }
#icon_god-map {
background-image: url(../../images/god9.png);
}
#icon_god-profiles { #icon_god-profiles {
background-image: url(../../images/god4.png); background-image: url(../../images/god4.png);
} }

2
pandora_console/operation/visual_console/render_view.php
View File

@ -66,7 +66,7 @@ if ($config["pure"] == 0) {
} }
if (give_acl ($config["id_user"], $id_group, "AW")) if (give_acl ($config["id_user"], $id_group, "AW"))
echo '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$id_layout.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>'; echo '<a href="index.php?sec=gmap&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$id_layout.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
echo '</h2>'; echo '</h2>';