| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
and other random stuff I noticed.
I think this finishes messing with code style. The codebase should match
the developer style guide closely enough that 99.9% of changes will not
feel the need to also massage the formatting.
|
|
|
|
|
|
|
|
|
|
| |
a) When we are doing combined fields and usecolspan2 is in effect, then usecolspan2 is also a signal that we want to spread the combined fields horizontally in a single row. In that case we want the combined fields to all be in a single "tr" tag enclosing them all. That was already working in that way.
b) But if usecolspan2 is NOT in effect, then we want the combined fields to still run "together" but vertically under each other. In this case we want each field to be in its own "tr" tag.
This change makes (b) happen.
If combinedfields is not set, then each of the "if" tests here still follows the same path it did previously, so there should be no effect on the HTML output for any ordinary package fields.
These are changes for master that correspond to https://github.com/pfsense/pfsense/pull/1672 on RELENG_2_2.
|
|
|
|
|
|
|
| |
Actually the "tr" tag needs to be a single tag-pair that encloses all of the set of fields with combinedfields specified - combinedfields=begin is where the "tr" tag starts and combinedfields=end is where the "tr" tag ends, enclosing a whole set of combined fields.
That allows usecolspan2 to work.
In the previous change I had made it enclose every field in its own "tr" tag-pair That caused usecolspan2 to be ineffective at spreading the combined fields across the display.
Also colspan needs to be initialised each time around the loop - it was getting applied to all fields further down the page after the first one it was used in.
This is the version for master.
|
|
|
|
|
| |
When specifying combinedfields begin and end in a package XML file, IE reports some unexpected start tag messages. This is because some "td" tags are not enclosed in "tr" tags in these cases, both at the begin and end of the combinedfields table that is generated. Firefox seems to be forgiving of this.
This has been investigated because BBscan177 who is developing pfBlockerNG is trying to use the combinedfields feature and it was not working so well. I will ask him to try these changes for RELENG_2_2 and confirm that they work.
When combinedfields is not set, then the code path with this change results in the same HTML being output as previously, so it should not change the HTML generated for packages that do not use combinedfields - i.e. I claim not to have broken anything else :)
|
|
|
| |
I broke the syntax!
|
|
|
|
|
|
|
|
|
| |
The syntax of these all seems good. Because the 2.3-DEVELOPMENT master
does not currently have get_pkg_info implemented, the available packages
tab always says "Unable to retrieve package info...".
But I don't think I broke any code.
This is integrated with the little changes for startdisplayingat var in
pkg.php
|
|\ |
|
| |
| |
| |
| | |
fix indent
|
| | |
|
| |
| |
| |
| |
| |
| | |
this allows schedule selection to pkg_edit.php, this can then be
utilized by packages to set schedules in many other places. This is the
first set of changes, will further modify other files to make full use
of schedules.
|
|/
|
|
| |
should fix #4238
|
|
|
|
| |
Noticed these had the copyright twice
|
| |
|
| |
|
| |
|
|
|
|
| |
HTTP_REFERER, there are a couple of places I didn't touch on this commit because it requires more work
|
| |
|
|
|
|
| |
exists before try to read it
|
| |
|
|
|
|
|
|
|
|
|
|
| |
"custom_php_after_head_command", if the PHP code also contains
JavaScript ("squid_auth.xml" for example) then this will cause HTML
errors, as you are not supposed to have anything between the closing
HEAD tag and the opening BODY tag.
Add the CLOSEHEAD PHP variable, move the include HEAD.INC into the PHP
IF statement and manually close the HEAD tab, else just include HEAD.INC
|
|
|
|
| |
Deprecate Ampersand in Anchor tags
|
|
|
|
|
|
|
|
| |
On packages that uses row_helper when user clicks on add or delete button, the page scrolls to top.
It seems something with ajax
http://stackoverflow.com/questions/1061580/jquery-click-on-anchor-element-forces-scroll-to-top
A simple return false after jquery action fixes the unwanted scroll.
|
|
|
|
| |
js files saved as UTF-8 / LF
language="JavaScript" deprecated, replaced with type="text/javascript"
|
|
|
| |
replaced <br>, <br/> and </br> with <br />
|
|
|
|
| |
Update HTML Boolean operator
|
| |
|
| |
|
|
|
|
|
|
|
| |
By default htmlspecialchars does not consider single quotes, what can be
a problem when value attribute is set using it. Replace value attribute
set to use double quotes on places where it's obviously recieving a
result of htmlspecialchars() call.
|
| |
|
|
|
|
|
| |
Move closing TR tag outside, otherwise the 'foreach' statement will
produce a duplicate closing TR tag.
|
|
|
|
| |
Add missing closing B tag
Add missing closing TD tag
|
|
|
|
|
| |
Remove duplicate $size variable
Add summary statement to TABLE tags
|
|
|
|
|
|
|
|
| |
Close INPUT tags
Update HTML boolean operators
Add missing start TR tag
Remove "name" statement from OPTION tag, invalid in XHTML
Remove duplicate "id" statement in SELECT tag
|
|
|
|
| |
Correct CDATA sections in SCRIPT tag
Correct ALT statement in IMG tag
|
|
|
| |
Correct CDATA section in SCRIPT tag
|
|
|
|
|
|
|
| |
Close BR and IMG tags and add ALT statement to IMG tags
Change ONCLICK to lower case
Move "fbegin.inc" PHP statement before the SCRIPTS
Add CDATA sections to SCRIPT tags
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
handle preoutput in the case of input errors also.
|
| |
|
|
|
|
|
|
|
|
| |
<showips>
<showvirtualips>
<showlistenall>
<hideinterfaceregex>
New features will show only with these new options on xml file
|
|
|
|
|
|
|
| |
movable rows, tootip with domtt.
new field types button, info as well combinefileds working and colspan2 on nodisplaname option.
jquery code improved too.
tested on squid, dansguardian, sshdcond , filer , pfblocker package.
|
| |
|
| |
|
|
|
|
| |
Changed the $text so that no "option value" is preselected when adding a newrow with addrowto function.
|
| |
|
| |
|