[Commotion-admin] [luci-commotion] Theme logic separation (#396)

areynold notifications at github.com
Wed Jun 25 15:09:50 EDT 2014


First attempt at separating Lua/LuCI functions from HTML in theme template files. Should result in easier theme customization, since web designers will not need to deal with Lua in order to edit HTML/CSS.

To test:
Check setup wizard, non-admin (apps, license, about) pages, login, and admin pages for proper functionality and page render. Check both full size and small display sizes.
You can merge this Pull Request by running:

  git pull https://github.com/opentechinstitute/luci-commotion theme-logic-separation

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/luci-commotion/pull/396

-- Commit Summary --

  * Theme: Restructured header.htm to separate luci from html
  * Theme:
  * Theme: Moved template javascript to separate include
  * Theme: Reformatted setup_wiz_sidebar
  * Theme: Moved sidenav to separate include file (sidenav.htm)
  * Theme: Moved stylesheet calls to separate include file (stylesheets.htm)
  * Theme: Reformatted subtree.htm
  * Theme: Moved page branding to separate include file (top-branding.htm)
  * Theme: Moved unsaved changes to separate file. Commented out extra 'end'
  * Theme: incorrect media paths in includes
  * Theme: Added missing title generator
  * Theme: Added missing title function
  * Theme: Incorrect include syntax in header.htm
  * Theme: Need to check that ucichanges is not nil before using it
  * Theme: Fixed bad path
  * Theme:
  * Theme: Moved context-dependent div to sidenav.htm
  * Theme: body tag class quotes closed too early

-- File Changes --

    M luasrc/view/themes/commotion/footer.htm (78)
    A luasrc/view/themes/commotion/functions/gen-title.htm (1)
    M luasrc/view/themes/commotion/header.htm (277)
    A luasrc/view/themes/commotion/javascript.htm (9)
    M luasrc/view/themes/commotion/setup_wiz_sidebar.htm (45)
    A luasrc/view/themes/commotion/sidenav.htm (13)
    A luasrc/view/themes/commotion/stylesheets.htm (16)
    M luasrc/view/themes/commotion/subtree.htm (75)
    A luasrc/view/themes/commotion/top-branding.htm (33)
    M luasrc/view/themes/commotion/unsaved_changes.htm (43)

-- Patch Links --

https://github.com/opentechinstitute/luci-commotion/pull/396.patch
https://github.com/opentechinstitute/luci-commotion/pull/396.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/luci-commotion/pull/396
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20140625/823d69f2/attachment.html>


More information about the Commotion-admin mailing list