Pkg.php with up and down function - almost there

marcelloc

I think it is useful to introduce it as an 'order' option in the xml for pkg tables.

Second great idea :)

marcelloc

I think it is useful to introduce it as an 'order' option in the xml for pkg tables.

Included on this version :)

To use it, set one of them on <adddeleteeditpagefields>xml part
<movable>arrow</movable> to show arrow characters
or
<movable>text</movable> to show text

sample:

	 <adddeleteeditpagefields><columnitem><fielddescr>Status</fielddescr>
			<fieldname>enable</fieldname></columnitem> 
		 <columnitem><fielddescr>action</fielddescr>
			<fieldname>action</fieldname></columnitem> 
		 <columnitem><fielddescr>local ID</fielddescr>
			<fieldname>localid</fieldname></columnitem> 
		 <columnitem><fielddescr>Description</fielddescr>
			<fieldname>description</fieldname></columnitem> 
		<movable>arrow</movable>

Still missing the save part.</adddeleteeditpagefields> 
```</adddeleteeditpagefields>

marcelloc

save part included :)

Backup your pkg.php file and download pkg.php modified from here(renamed to pkg.txt)

the xml new args for adddeleteeditpagefields

are <movable>arrow</movable> or <movable>text</movable>

inside <columnitem>, you can include <encoding>base64</encoding> to show base64 fields.

All test are wellcome</columnitem>

Nachtfalke

Hi Marcello,

I tried with your new pkg.php file and modified some of my .xml in freeradius.
The GUI is working, moving the lines is working, too - but - how can I save it !?!

Thank you. :)

clients.jpg_thumb

ccesario

Hi Marcello..

I tested this in others browser too… And all working!

Chromium 18.0.1025.151
Firefox 12.0
IE 9.0.8112.16421
Nokia BrowserNG/1.1.4
Chrome 19.0.1084.46

att,

order.png_thumb

ccesario

@Nachtfalke:

Hi Marcello,

I tried with your new pkg.php file and modified some of my .xml in freeradius.
The GUI is working, moving the lines is working, too - but - how can I save it !?!

Thank you. :)

Nachtfalke,

Its attached the image with save button detail :)

order.png_thumb

Nachtfalke

@ccesario:

(…)
Nachtfalke,

Its attached the image with save button detail :)

Ooops ::)
Now I got it! And it is working as it should. Really nice to see that feature working :-)

Some questions: ;)
I know, it depends on the number of entries but is there a plan to improve this feature so that I am able to move a line faster to the top than just always one line after another ? I think about something like it is done in firewall rules ?

Is it possible to implement a feature that allows us to sort the entries (descending, ascending by name, or by IP or something else ?) Just sorting on the GUI - not re-arrange them it the config-files ?

marcelloc

The sort feature is already on original pkg.PHP code.
The movable feature is different from rules code. I will need some rewrites and time

Nachtfalke

@marcelloc:

The sort feature is already on original pkg.PHP code.

It's not working for me. Do I have to add some XML code to use it ?
For example on freeradius users I want to click on "username" and then get all the usernames sorted ascending. Same with VLAN ID and so on.

@marcelloc:

The movable feature is different from rules code. I will need some rewrites and time

Great. The most important and most helpful thing for me is the possibility to move items up and down.
The rest is just for better handling :-)

marcelloc

@Nachtfalke:

It's not working for me. Do I have to add some XML code to use it ?

Include this field on your xml

 <field><fielddescr>sortable</fielddescr>
		<fieldname>sortable</fieldname>
		<display_maximum_rows>10</display_maximum_rows>
		<type>sorting</type>
		 <include_filtering_inputbox><sortablefields><name>Local id</name>
				<fieldname>localid</fieldname> 
			 <name>Action</name>
				<fieldname>action</fieldname></sortablefields></include_filtering_inputbox></field>

In this example, I'm filtering localid and action fields.

Update the pkg.php again, ~~I`ve pushed a fix to avoid movable and sortable enabled on the same xml until I find a way to use both together .~~

EDIT:

All features are working together :)
I've include the to adddeleteeditpagefields as well domtt tittles.

I think it's done!

att,
Marcello Coutinho

marcelloc

I think we got it! :D

latest code using template images.

**<adddeleteeditpagefields></adddeleteeditpagefields>**new features on this code:

To enable movable table and buttons, just add <movable>on</movable>
To add a ? button besides + button with a description for this list, include <description>My list description</description>

new features on this code:

To customize checkbox display info on list, use <listmodeon>enable or selected text here</listmodeon> and <listmodeoff>disable or off text here</listmodeoff>
To show base64 fields on list, use <encoding>base64</encoding>

gui_movable_1.png_thumb

gui_movable_2.png_thumb

dvserg

Great job, marcelloc !
Do you think it might be better to increase the interval between e/x, and arrows?

marcelloc

@dvserg:

Great job, marcelloc !
Do you think it might be better to increase the interval between e/x, and arrows?

Thanks, you've helped a lot explaining the code :)

I've included all buttons on a single < td > to leave more space to fields.
The remove button has an alert to prevent mistakes.

what do you think? Did you had time to test it on squidguard?

dvserg

@marcelloc:

Thanks, you've helped a lot explaining the code :)
I've included all buttons on a single < td > to leave more space to fields.
The remove button has an alert to prevent mistakes.
what do you think? Did you had time to test it on squidguard?

I want to do it in the next few days as soon as I find free time

jimp

When you make these changes and submit them, please do this on the master branch and not RELENG_2_0

RELENG_2_0 is for bug fixes only, it's not meant as a target for new features.

As it is, someone would have to manually pull that change into master, assuming it applies cleanly, and if nobody does, it'll be missing from 2.1.

The proper procedure is to add things into master first, and if it's deemed minor enough or an important fix, then things can be merged back from master to the other branches.

marcelloc

Ok jimp.

I'll merge this code on 2.1 and test before submit to master.

I've pushed to releng 2 because all tests where done on 2.0.1

Thanks.

jimp

Any sign of this for 2.1? I don't recall seeing a new pull request or commit.

marcelloc

@jimp:

Any sign of this for 2.1? I don't recall seeing a new pull request or commit.

I'll pull this week. :)

marcelloc

Jimp,

2.1 is almost based on jquery and the movable I did with ccesarios is based on prototype.

Do you mind if ccesario and me try to migrate it to jquery with drag and drop before the pull request?

att,
Marcello Coutinho

jimp

Yes it should be jquery on 2.1.