Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LCDproc #178

Merged
merged 23 commits into from
Dec 14, 2016
Merged

Add LCDproc #178

merged 23 commits into from
Dec 14, 2016

Conversation

Treer
Copy link
Contributor

@Treer Treer commented Aug 25, 2016

  • 308076b is a pfSense 2.3 ports package containing the original LCDproc files
  • at 7fe021f the conversion of the UI to use the new OO Forms system is finished
  • at 93f8cfa I've added 3 extra screens to take advantage of 4+ row LCDs

One of the extra screens is displaying the output of bandwidth_by_ip.php, but that file is designed for ajax calls so requires an authenticated session, so this LCDproc package has its own copy of that file which it can run locally in the usr/local/pkg directory, which seems unfortunate but necessary, perhaps someone has a better idea?

I've compiled and used this as a manually installed ports package in pfSense 2.3.1-RELEASE-p5 and 2.3.3-DEVELOPMENT, with the new UI and screens, but don't know how to test it with pfSense's package manager, and have not made a package for pfSense before.

This is built from the LCDproc-dev package as it's had more work and functionality added than LCDproc. LCDproc-dev was created to add early support for LCDProc 0.5.4 without affecting LCDproc, and since this port will be using LCDProc 0.5.7+, there's no need to keep maintaining two packages.
Fixes bug where bps measurements stayed 0
Shows the same data as the list on the Traffic Graph screen - bandwidth by IP/host
Fix up some of the file heading comments
The label can go back to "Total today" once resetting the totals daily has been implemented.
The screen was showing totals since boot, so they are now seperate screens.
Removed text describing the interface sort order, since this will be fixed if all interfaces can fit on screen.
@Treer
Copy link
Contributor Author

Treer commented Sep 8, 2016

hubba has also posted a fix for the CARP screen, I have included it in this pull request as it looks correct, but I don't have a CARP setup (or experience using CARP) so have not tested it.

do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/pkg
${MKDIR} ${STAGEDIR}/etc/inc/priv
${MKDIR} ${STAGEDIR}${PREFIX}/www/packages/lcdproc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace before EOL, please remove

MAINTAINER= [email protected]
COMMENT= LCDproc package for pfSense

LICENSE= ESF
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We moved from ESF to APACHE20 license

INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change license text to APACHE20

ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
/* ====================================================================================== */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix license text

</copyright>
<title>Services: LCDproc</title>
<name>lcdproc</name>
<version>0.10.3</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change 0.10.3 to %%PKGVERSION%% knob

${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
${STAGEDIR}${DATADIR}
@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
${STAGEDIR}${DATADIR}/info.xml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add all XML files that use %%PKGVERSION%% knob to this REINPLACE_CMD statement

INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix license text

@rbgarga rbgarga self-assigned this Dec 5, 2016
www/packages/lcdproc/lcdproc_screens.php
www/packages/lcdproc/index.php
%%DATADIR%%/info.xml
@dir /etc/inc/priv
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's missing @dir /etc/inc here

First part of changes requested by rbgarga
Second part of changes requested by rbgarga
@Treer
Copy link
Contributor Author

Treer commented Dec 10, 2016

Changes performed.

I think GitHub's "View Changes" function (or whatever you used) collapsed 3 of the larger files, causing them to be overlooked. They also needed license text fixed:

  • sysutils\pfSense-pkg-LCDproc\files\usr\local\pkg\lcdproc_client.php
  • sysutils\pfSense-pkg-LCDproc\files\usr\local\pkg\lcdproc.inc
  • sysutils\pfSense-pkg-LCDproc\files\usr\local\www\packages\lcdproc\lcdproc.php

I've fixed the license text for those 3 in the last commit - ad76a83

@rbgarga
Copy link
Member

rbgarga commented Dec 14, 2016

Added to 2.4.0 and 2.3.3 snapshots. After more people test it and it's ready, we can add to 2.3.2

@netgate-git-updates netgate-git-updates merged commit 2d29d6a into pfsense:devel Dec 14, 2016
netgate-git-updates pushed a commit that referenced this pull request Dec 14, 2016
@Treer
Copy link
Contributor Author

Treer commented Jan 26, 2017

By copying the files from the old package into this new ports package, I've managed to lose their git histories.

Is it possible to get the git commit message of this commit amended to include some sort of link to the git repo the files came from?

netgate-git-updates pushed a commit that referenced this pull request Apr 6, 2020
Changes since 1.5.3:

Interface:

    * A redesigned interface that works better for smaller screens (#176)
    * Improved fullscreen mode with an overlaid headerbar (#4)
    * The headerbar and the progress bar now auto-hide, for a distraction-free
      reading experience
    * Various location information, as well as a clock, can now be displayed in
      the footer (#175, #233)
    * A new location popover (Ctrl + L) that shows reading time estimates and
      allows skipping to locations (#155)
    * E-reader style navigation: go to the previous or next page by tapping on
      the left or right part of the view; tap on the middle to toggle header bar
      and progress bar
    * Annotations, bookmarks, and find results now show chapter titles (#162)
    * When looking up words in dictionaries, the query can now be edited (#156)
    * New shortcut for viewing metadata (Ctrl + I) and preferences (Ctrl + ,)
    * A new traditional menubar, which may be displayed depending on the desktop
      environment
    * Option to use a traditional titlebar and menubar instead of a headerbar
      (experimental)

Reading:

    * Continuous scrolling layout
    * Option to show decorative shadows that mimic the appearance of a real book
    * Ability to zoom in and zoom out (#117)
    * Improved image viewer with "save as" option
    * Open copies of a book in new windows (Ctrl + N)
    * Reload book (Ctrl + R)
    * New built-in themes: Gray, Solarized, Gruvbox, Nord

Text selection:

    * Ability to select text across pages
    * Find selected text in book
    * Speak selected text or from the selected location (#141)

Annotations:

    * Spellcheck notes (requires new optional dependency "gspell")
    * Export annotations to Markdown (#180)
    * Options to use custom colors for highlights

For publishers and developers:

    * Support for Apple Books theme attribute, which allows books to detect
      themes without JavaScript (#178)
    * WebKit's developer tools can be enabled

Breaking changes:

    * The settings schemas has been reorganized
    * The format for custom themes has changed
    * Locations are now 1024 characters in size

Bug fixes:

    * Fixed not restoring exact last location
    * Fixed navigation not working with scrolled layout
    * Fixed font size not changing when the book uses absolute-size keywords
      (#173)
    * Fixed text cut off at margin edge (#177)
    * Fixed unable to open books with "#" or "?" in the file name
netgate-git-updates pushed a commit that referenced this pull request Nov 20, 2021
Changes since 0.1.1:

> This version has some breaking changes in the config file and, you will
need to regenerate the config for all features to work.

- The tool is now compatible with next-gen/team-managed project.
- New filters when listing issues, viz:
  - Filter by parent: This will allow you to list all sub-tasks of a task.
  - Order by filter: This will allow you to display a list sorted by their
    rank for example.
- You can now assign epic to the issue on creation.
- You can add issues to the sprint with `jira sprint add`

- feat: Allow to assign epic on create #194
- feat: Cmd to add issues to sprint #205
- feat: Allow to filter by parent #197
- feat: Add order-by filter #206
- feat: Add type on project listing #190

- fix: Make epic add work in next-gen project #195
- fix: Epic creation for next-gen project #192
- fix: Make epic remove work in next-gen project #196
- fix: Make epic list work for next-gen project #201
- fix: Segmentation fault on view #202
- fix(tui): Link/key copy is broken for altered key col #204

- cfg!: Expand config to include project type #191
- cfg!: Rename field to name and add link field to epic #193

- dep: Upgrade rivo/tview #176
- dep: Upgrade outdated deps to latest #177
- dep: Use Go 1.17 #178

**Full Changelog**: ankitpokhrel/jira-cli@v0.1.1...v0.2.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants