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

changed <table> to <div> for sorted submenues #709

Merged
merged 7 commits into from Sep 15, 2019

Conversation

@ptweety
Copy link
Contributor

commented Sep 12, 2019

Signed-off-by: ptweety me@ptweety.net

enhances #663

Signed-off-by: ptweety <me@ptweety.net>
@ptweety

This comment has been minimized.

Copy link
Contributor Author

commented Sep 12, 2019

Hi,

hier noch ein Beispiel der /etc/config/color.map, um die Sortierung durch den Nutzer nach belieben zu ändern:

active                  #3678c9
attention               red
activeBackground        #f0f0f0
background              #192c6e

contentBackground       #ffffff

backgroundStart         #89989b
backgroundEnd           #ffffff

black                   #000000
clickable               #89989b
inactiveBackground      #bcc7cb
okSignal                #00c300
warnSignal              #ffff00
white                   white

inactiveButton          #c0c0c0

channelHighlight        #cc6600
channelBackground       #ffffff
channelBorder           #5c7287

inherit                 inherit
transparent             transparent
windowText              WindowText

blue                    #000066
gray                    #999999
testActive              #ffff00
testOk                  #00ff00
red                     red 
progressbarHighlight    #003366
progressbarBackground   #999999
progressbarText         #ffffff
gray                    gray
darkgray                darkgray
profile                 #e0e0e0
profileActive           #99ccff
grayText                GrayText
textColorA              white
textColorB              black

navBarSeparator         #bcc7cb

mainMenuBackground      #ebf1f2
subMenuBackground       #ebf1f2
subMenuHighlight        #89989b

messagesBackground      #ebf1f2
logoutButton            #ebf1f2

programEven             #bcc7cb
programOdd              "#ebf1f2; }

/* ------------------------------------------------------------------ */
/* menu order - menuControlPage */

#menuControlPage_SUBMENU #submenuDiagramListPage,
#btnDiagramList_container { order: 4; }

#menuControlPage_SUBMENU #submenuFavorites,
#tblStatus #btnFavs_container { order: 5; }

#menuControlPage_SUBMENU #submenuDevices,
#tblStatus #btnChns_container { order: 1; }

#menuControlPage_SUBMENU #submenuFunction,
#tblStatus #btnFunctions_container { order: 3; }

#menuControlPage_SUBMENU #submenuPrograms,
#tblStatus #btnProgs_container { order: 6; }

#menuControlPage_SUBMENU #submenuRooms,
#tblStatus #btnRooms_container { order: 2; }

#menuControlPage_SUBMENU #submenuSysProtocol,
#tblStatus #tdSysProc_container { order: 8; }

#menuControlPage_SUBMENU #submenuSysVar,
#tblStatus #btnSysVar_container { order: 7; }

/* ------------------------------------------------------------------ */
/* menu order - menuProgramsLinksPage */

#menuProgramsLinksPage_SUBMENU #submenuDirectLinks,
#tblProgramsLinks #btnDirectDeviceLinks_container { order: 1; }

#menuProgramsLinksPage_SUBMENU #submenuProgramsLinks,
#tblProgramsLinks #btnCreateProgramsAndLinks_container { order: 2; }

/* ------------------------------------------------------------------ */
/* menu order - menuSettingsPage */

#menuSettingsPage_SUBMENU #submenuUserManagement,
#tblSettings #btnSettingsUserAdministration_container { order: 8; }

#menuSettingsPage_SUBMENU #submenuCreateDiagram,
#tblSettings #btnSettingsDiagrams_container { order: 5; }

#menuSettingsPage_SUBMENU #submenuFavorites,
#tblSettings #btnSettingsFavorites_container { order: 10; }

#menuSettingsPage_SUBMENU #submenuDevices, 
#tblSettings #btnSettingsDevices_container { order: 2; }

#menuSettingsPage_SUBMENU #submenuDeviceFirmwareInformation,
#tblSettings #submenuDeviceFirmwareInformation_container { order: 7; }

#menuSettingsPage_SUBMENU #submenuDeviceInbox,
#tblSettings #btnSettingsDeviceInBox_container { order: 1; }

#menuSettingsPage_SUBMENU #submenuFunction,
#tblSettings #btnSettingsFunctions_container { order: 4; }

#menuSettingsPage_SUBMENU #submenuCreateGroups,
#tblSettings #btnSettingsGroups_container { order: 6; }

#menuSettingsPage_SUBMENU #submenuRooms,
#tblSettings #btnSettingsRooms_container { order: 3; }

#menuSettingsPage_SUBMENU #submenuSysControl,
#tblSettings #btnSettingsSystemConfig_container { order: 11; }

#menuSettingsPage_SUBMENU #submenuSysVar,
#tblSettings #btnSettingsSysVar_container { order: 9; }

// #submenuCreateTestPage { order: 12; }
// #submenuDeviceFirmware { order: 13; }

.CLASS05501, .CLASS06101 {
    display: none;
}

"

deviceListRowHighlight  #89989b
borderColor             #f0f0f0

shutterOpeningDegree    #89989b
link                    #0101FF
@jens-maus

This comment has been minimized.

Copy link
Owner

commented Sep 12, 2019

Danke! Bekommst du es auch noch hin das das mit den div exakt so aussieht wie vorher? Im letuten screenshot den du gezeigt hattest waren die abstände zwischen den zellen, etc. ja etwas anders...

ptweety added 2 commits Sep 12, 2019
Signed-off-by: ptweety <me@ptweety.net>
Signed-off-by: ptweety <me@ptweety.net>
@ptweety

This comment has been minimized.

Copy link
Contributor Author

commented Sep 12, 2019

Hi @jens-maus,

das sollte jetzt hoffentlich passen und fast genau wie das original aussehen

@jens-maus

This comment has been minimized.

Copy link
Owner

commented Sep 12, 2019

Danke. Kannst du bitter noch zwei screenshots vorher/nachher zeigen?

@ptweety

This comment has been minimized.

Copy link
Contributor Author

commented Sep 12, 2019

Hier die Screenshots:

Vorher:

vorher

Nachher:

nachher

Nachher mit color.map:

nachher mit color-map

ptweety and others added 4 commits Sep 14, 2019
Signed-off-by: ptweety <me@ptweety.net>
Signed-off-by: ptweety <me@ptweety.net>
patch shrinks to the absolutely minimal one.
@jens-maus

This comment has been minimized.

Copy link
Owner

commented Sep 15, 2019

@ptweety So, hab noch ein paar Kleinigkeiten bereinigt. Was genau bringen denn bitte die linkprog.htm Verbesserungen?

@jens-maus jens-maus added this to the next release milestone Sep 15, 2019
@jens-maus jens-maus merged commit 5b627c7 into jens-maus:master Sep 15, 2019
@ptweety

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2019

Das ist eigentlich nur dafür, dass auch dort die Reihenfolge in der gleichen Weise angepasst werden kann, wie bei den beiden anderen Menüs und der control.htm / systemconfig.htm

@jens-maus

This comment has been minimized.

Copy link
Owner

commented Sep 15, 2019

Und das betrifft welche Menüs genau? Direkte Verknüpfungen und Programme?!?

@ptweety

This comment has been minimized.

Copy link
Contributor Author

commented Sep 15, 2019

Genau dieses. Achte unten Rechts in den Bildern auf das css und die order-Eigenschaft. Damit kann in einem Rutsch die Reihenfolge im Menü und auch auf der Detail-Seite angepasst werden.

Bildschirmfoto 2019-09-15 um 13 08 51

Bildschirmfoto 2019-09-15 um 13 09 04

@ptweety ptweety deleted the ptweety:0061-WebUI-MenuSortedIcons branch Sep 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.