Commit 273f9ce2 authored by Leigh B Stoller's avatar Leigh B Stoller Committed by Gary Wong

Switch to bootstrap V3.0.

parent 9d0467b1
......@@ -150,7 +150,10 @@ APTUIFILES = $(wildcard $(SRCDIR)/aptui/*.php)
APTUIFILES += $(wildcard $(SRCDIR)/aptui/*.js)
APTUIFILES += $(wildcard $(SRCDIR)/aptui/*.css)
APTUIFILES += $(wildcard $(SRCDIR)/aptui/*.png)
UIKITFILES = $(wildcard $(SRCDIR)/aptui/uikit/fonts/*)
UIKITFILES = $(wildcard $(SRCDIR)/aptui/uikit/fonts/*)
BOOTSTFONTS = $(wildcard $(SRCDIR)/aptuib/bootstrap/fonts/*)
BOOTSTCSS = $(wildcard $(SRCDIR)/aptuib/bootstrap/css/*)
BOOTSTJS = $(wildcard $(SRCDIR)/aptuib/bootstrap/js/*)
# need to make it *.gz; with simply "*",
# we end up sucking over "CVS"
......@@ -211,6 +214,11 @@ ALLBLOB = $(notdir $(BLOBFILES))
ALLAPTUI = $(notdir $(APTUIFILES))
ALLUIKITFONTS = $(notdir $(UIKITFILES))
ALLAPTUIB = $(notdir $(APTUIBFILES))
ALLBOOTSTFONTS = $(notdir $(BOOTSTFONTS))
ALLBOOTSTCSS = $(notdir $(BOOTSTCSS))
ALLBOOTSTJS = $(notdir $(BOOTSTJS))
INSTALLFILES = $(addprefix $(INSTALL_SBINDIR)/, htmlinstall) \
$(addprefix $(INSTALL_WWWDIR)/, $(ALLFILES)) \
$(addprefix $(INSTALL_WWWDIR)/floormap/, $(ALLFLOORMAPS)) \
......@@ -252,9 +260,9 @@ endif
$(INSTALL_OPSCVSWEBCGI)
apt-install: $(addprefix $(INSTALL_WWWDIR)/apt/, $(ALLAPTUI)) \
$(INSTALL_WWWDIR)/apt/uikit/js/uikit.js \
$(INSTALL_WWWDIR)/apt/uikit/css/uikit.almost-flat.css \
$(addprefix $(INSTALL_WWWDIR)/apt/uikit/fonts/, $(ALLUIKITFONTS))
$(addprefix $(INSTALL_WWWDIR)/apt/bootstrap/css/, $(ALLBOOTSTCSS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/bootstrap/js/, $(ALLBOOTSTJS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/bootstrap/fonts/, $(ALLBOOTSTFONTS))
post-install:
......@@ -285,6 +293,11 @@ $(INSTALL_WWWDIR)/apt/%: aptui/%
-mkdir -p $(patsubst %/,%,$(dir $@))
$(INSTALL_DATA) $(subst $$,\$$,$<) $(subst $$,\$$,$@)
$(INSTALL_WWWDIR)/aptb/%: aptuib/%
@echo "Installing $<"
-mkdir -p $(patsubst %/,%,$(dir $@))
$(INSTALL_DATA) $(subst $$,\$$,$<) $(subst $$,\$$,$@)
$(INSTALL_DIR)/opsdir/www/%.html: %.html htmlinstall
@echo "Installing $<"
-mkdir -p $(patsubst %/,%,$(dir $@))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment