View | Details | Raw Unified | Return to bug 12657
Collapse All | Expand All

(-)a/debian/rules (-51 lines)
Lines 28-37 override_dh_auto_install: Link Here
28
	ln -s /usr/share/tinymce/www \
28
	ln -s /usr/share/tinymce/www \
29
              $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce
29
              $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/lib/tiny_mce
30
	rm -r \
30
	rm -r \
31
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/yui
32
	ln -s /usr/share/javascript/yui \
33
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/lib/yui
34
	rm -r \
35
              $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
31
              $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
36
	ln -s /usr/share/javascript/yui \
32
	ln -s /usr/share/javascript/yui \
37
         $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
33
         $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/lib/yui
Lines 47-103 override_dh_auto_install: Link Here
47
	sed -i $(TMP)/usr/share/koha/koha-conf.xml.in \
43
	sed -i $(TMP)/usr/share/koha/koha-conf.xml.in \
48
		-e '/^ <user>/s/>.*</>_DBC_DBUSER_</' \
44
		-e '/^ <user>/s/>.*</>_DBC_DBUSER_</' \
49
		-e '/^ <pass>/s/>.*</>_DBC_DBPASS_</'
45
		-e '/^ <pass>/s/>.*</>_DBC_DBPASS_</'
50
	install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
51
         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
52
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
53
	install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
54
         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
55
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
56
	install -m 0644 koha-tmpl/opac-tmpl/lib/yui/skin.css \
57
         koha-tmpl/opac-tmpl/lib/yui/reset-fonts-grids.css \
58
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/ccsr/en/css
59
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
60
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
61
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
62
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
63
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
64
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
65
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
66
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
67
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
68
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
69
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
70
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
71
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
72
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
73
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
74
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
75
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
76
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
77
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
78
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
79
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
80
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
81
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
82
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
83
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
84
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
85
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
86
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
87
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \
88
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
89
	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png  \
90
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
91
	sed -i -e 's:url(.*/reset-fonts-grids.css.*):url("/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css"):' \
46
	sed -i -e 's:url(.*/reset-fonts-grids.css.*):url("/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css"):' \
92
		   -e 's:url(.*/skin.css.*):url("/opac-tmpl/lib/yui/assets/skins/sam/skin.css"):' \
47
		   -e 's:url(.*/skin.css.*):url("/opac-tmpl/lib/yui/assets/skins/sam/skin.css"):' \
93
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/opac.css \
48
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/opac.css \
94
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/sco.css
49
		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/*/en/css/sco.css
95
	sed -i -e 's:href="/opac-tmpl/lib/yui/reset-fonts-grids.css":href="/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css":' \
96
		   -e 's:href="/opac-tmpl/lib/yui/skin.css":href="/opac-tmpl/lib/yui/assets/skins/sam/skin.css":' \
97
        $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/ccsr/en/includes/doc-head-close.inc
98
	sed -i -e 's:url(.*/reset-fonts-grids.css.*):url(reset-fonts-grids.css):' \
99
		   -e 's:url(.*/skin.css.*):url(skin.css):' \
100
		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css/staff-global*.css
101
	mkdir -p $(TMP)/debian/tmp_docbook
50
	mkdir -p $(TMP)/debian/tmp_docbook
102
	xt/verify-debian-docbook.t
51
	xt/verify-debian-docbook.t
103
	xsltproc --output $(TMP)/debian/tmp_docbook/ \
52
	xsltproc --output $(TMP)/debian/tmp_docbook/ \
(-)a/debian/scripts/koha-translate (-8 / +8 lines)
Lines 72-87 list() Link Here
72
print_available()
72
print_available()
73
{
73
{
74
    # Loop over only one opac theme
74
    # Loop over only one opac theme
75
    for i in $( ls $PO_DIR | grep opac-t-prog ); do
75
    for i in $( ls $PO_DIR | grep opac-bootstrap ); do
76
        echo `basename $i -i-opac-t-prog-v-3006000.po` | \
76
        echo `basename $i -i-opac-bootstrap.po` | \
77
            grep -v -x -e en
77
            grep -v -x -e en
78
    done
78
    done
79
}
79
}
80
80
81
print_installed()
81
print_installed()
82
{
82
{
83
    ls $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/ | \
83
    ( ls -1 $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/bootstrap/ ; \
84
        grep -v -e images -e itemtypeimg -x -e en
84
        ls -1 $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/ 2> /dev/null ) | \
85
        sort | uniq | \
86
        grep -v -e images -e itemtypeimg -x -e en -e css -e js -e less -e lib
85
}
87
}
86
88
87
install_lang()
89
install_lang()
Lines 153-158 remove_lang() Link Here
153
        if print_installed | grep -q $lang; then
155
        if print_installed | grep -q $lang; then
154
            rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/$lang
156
            rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/prog/$lang
155
            rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/ccsr/$lang
157
            rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/ccsr/$lang
158
            rm -rf $KOHA_INSTALL_DIR/opac/htdocs/opac-tmpl/bootstrap/$lang
156
            rm -rf $KOHA_INSTALL_DIR/intranet/htdocs/intranet-tmpl/prog/$lang
159
            rm -rf $KOHA_INSTALL_DIR/intranet/htdocs/intranet-tmpl/prog/$lang
157
        else
160
        else
158
            die "Error: the selected language is not already installed."
161
            die "Error: the selected language is not already installed."
Lines 166-174 check_lang_po_files() Link Here
166
{
169
{
167
    lang=$1
170
    lang=$1
168
171
169
    po_files="$PO_DIR/$lang-i-opac-t-prog-v-3006000.po
172
    po_files="$PO_DIR/$lang-opac-bootstrap.po
170
              $PO_DIR/$lang-opac-ccsr.po
171
              $PO_DIR/$lang-i-staff-t-prog-v-3006000.po
172
              $PO_DIR/$lang-pref.po"
173
              $PO_DIR/$lang-pref.po"
173
174
174
    if [ "$lang" != "" ]; then
175
    if [ "$lang" != "" ]; then
175
- 

Return to bug 12657