From 57e979a3b52aa16614873e102a5258d2ade8d6ae Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 10 Oct 2013 03:46:25 +0000
Subject: [PATCH] Add icons for custom forms
---
include/class.nav.php | 4 ++--
include/staff/dynamic-forms.inc.php | 2 +-
include/staff/dynamic-lists.inc.php | 2 +-
js/redactor-osticket.js | 1 -
scp/css/scp.css | 7 +++++++
scp/images/icons/icon-form-add.png | Bin 0 -> 1545 bytes
scp/images/icons/icon-form.png | Bin 0 -> 1442 bytes
scp/images/icons/icon-list-add.png | Bin 0 -> 1260 bytes
scp/images/icons/icon-list.png | Bin 0 -> 804 bytes
9 files changed, 11 insertions(+), 5 deletions(-)
create mode 100644 scp/images/icons/icon-form-add.png
create mode 100644 scp/images/icons/icon-form.png
create mode 100644 scp/images/icons/icon-list-add.png
create mode 100644 scp/images/icons/icon-list.png
diff --git a/include/class.nav.php b/include/class.nav.php
index ac8c0228c..89f47ed75 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -208,8 +208,8 @@ class AdminNav extends StaffNav{
$subnav[]=array('desc'=>'SLA Plans','href'=>'slas.php','iconclass'=>'sla');
$subnav[]=array('desc'=>'API Keys','href'=>'apikeys.php','iconclass'=>'api');
$subnav[]=array('desc'=>'Pages', 'href'=>'pages.php','title'=>'Pages','iconclass'=>'pages');
- $subnav[]=array('desc'=>'Forms','href'=>'forms.php','iconclass'=>'pages');
- $subnav[]=array('desc'=>'Lists','href'=>'lists.php','iconclass'=>'pages');
+ $subnav[]=array('desc'=>'Forms','href'=>'forms.php','iconclass'=>'forms');
+ $subnav[]=array('desc'=>'Lists','href'=>'lists.php','iconclass'=>'lists');
break;
case 'emails':
$subnav[]=array('desc'=>'Emails','href'=>'emails.php', 'title'=>'Email Addresses', 'iconclass'=>'emailSettings');
diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php
index 0b4a8e154..0990da7c2 100644
--- a/include/staff/dynamic-forms.inc.php
+++ b/include/staff/dynamic-forms.inc.php
@@ -2,7 +2,7 @@
<h2>Custom Forms</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
- <b><a href="forms.php?a=add" class="Icon">Add New Custom Form</a></b></div>
+ <b><a href="forms.php?a=add" class="Icon form-add">Add New Custom Form</a></b></div>
<div class="clear"></div>
<?php
diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php
index 67510792d..2baf9f81a 100644
--- a/include/staff/dynamic-lists.inc.php
+++ b/include/staff/dynamic-lists.inc.php
@@ -2,7 +2,7 @@
<h2>Custom Lists</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
- <b><a href="lists.php?a=add" class="Icon">Add New Custom List</a></b></div>
+ <b><a href="lists.php?a=add" class="Icon list-add">Add New Custom List</a></b></div>
<div class="clear"></div>
<?php
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index 4e5fc2cee..0fd53146f 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -136,7 +136,6 @@ $(function() {
'imageGetJson': 'ajax.php/draft/images/browse',
'syncBeforeCallback': captureImageSizes
};
- console.log(el.data('redactor'));
if (el.data('redactor')) return;
if (el.hasClass('draft')) {
var reset = $('input[type=reset]', el.closest('form')),
diff --git a/scp/css/scp.css b/scp/css/scp.css
index ae4a0229b..557f03442 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -295,6 +295,9 @@ a.newDepartment { background:url(../images/icons/new_department.gif) }
a.pages { background:url(../images/icons/pages.gif) }
a.newPage { background:url(../images/icons/new_page.gif) }
+a.forms { background:url(../images/icons/icon-form.png); background-size: 16px 16px; }
+a.lists { background:url(../images/icons/icon-list.png); background-size: 16px 16px; }
+
/* Generic CSS based Icons. use=> <tag class="Icon iconname">text</tag> */
.Icon {
@@ -302,6 +305,8 @@ a.newPage { background:url(../images/icons/new_page.gif) }
padding-left:20px;
background-position: left center;
background-repeat: no-repeat;
+ min-height: 16px;
+ display: inline-block;
}
@@ -352,6 +357,8 @@ a.Icon:hover {
.Icon.alertLog { background:url(../images/icons/log_alert.gif) 0 2px no-repeat; }
.Icon.errorLog { background:url(../images/icons/log_error.gif) 0 2px no-repeat; }
+.Icon.form-add { background:url(../images/icons/icon-form-add.png) 0 0 no-repeat; background-size: 16px 16px; }
+.Icon.list-add { background:url(../images/icons/icon-list-add.png) 0 0 no-repeat; background-size: 16px 16px; }
#content {
diff --git a/scp/images/icons/icon-form-add.png b/scp/images/icons/icon-form-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..55a300f10b9f8ccccd1bc7f8005f03aa9cc03634
GIT binary patch
literal 1545
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
Tw3cIFU|{fc^>bP0l+XkK*`W5<
literal 0
HcmV?d00001
diff --git a/scp/images/icons/icon-form.png b/scp/images/icons/icon-form.png
new file mode 100644
index 0000000000000000000000000000000000000000..810092eeab835eb478442b5971cc92f4a4b0e7e0
GIT binary patch
literal 1442
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}EX7WqAsieW95oy%9SjT%
zoCO|{#S9FLK_JZ7BK?q;fq_A?#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#W
zDFy~sc~2L|kcif;(_?cchsqqQe}DYi)`-N_iG3dzs&4X~X34gr)cB@Yf@IoEzp{ld
zT00Yr)}=_eaO%yCoA9%6VW9pM9VIT7)>KY~1v(aL$v(@=gy*U~5@?&IfBRx-?)~o-
zAH8<x<?nWV;5lpG^ZU=|Jhy!Qcm99NsVxFN?0MUN2PQ1mIlXh&y81<{UP(u9&$G2(
zd(KnAzx~RcJA0UJ<Zr(%Ut~3Rb82Lr-{mdeW{a{<Xc5?P_nqY=6<u*B56%kx$hFs&
z_V)H}TD9uSmoEh`E-0#a-coA$akQnL_s6c4D?R6*YIs$)`#O_#i-4EY^hqsOvs^<%
z8QzpxGdOj;^*r`2J2O-B{+`Os_A?omE?V?R!5~{}`QpWkWA@cZ&Od+r<KyF;txmzE
zCoh@2{r>6Gr}vX4h9u}UEYc7W6JvVt{kNoy%p4av35f;!_se@ul9<28Y<BOSJvIz`
z;`E)Jof$Y3H!Uw(=_VgCb=EAY12b~7v$f;aoA=c?m+aZGNMp*hX+dFOY!3PP`Bx5<
zESSZ*HcVUEEN8|y1@q?2+{3pyFN^Mwyz#ayMo*lto!N6zS7Xoueu=$%*|u<Ka9MVX
zZM=}^y6+SFnYbN7imM!7y!cfovX!yJTPK+L?%lhEom+Bl8qM)bPb#!!s^>rSP;7@m
zgA~`1WB!{D-(i~hN_T6@nfS&vcHD3FIvSj9>=xG#3JN;(>gwu3tGO||N;DfcF~l|}
z=O6yvfB5EQ0bz52FNgDEKio^!ob#hV%;`RFj!zat!m%EZ`*g&-AI)U0*~aNtlOSQ}
zyh^l4tLJ%gzGL;|o^@Lpx`m|zLZ|li@!h(0>qCXjMIjk>U7mT(A1+^f!X|%@&3_Mb
z>UoK``)WUAFL&U7&lKcSoN#qjXira%%k7shUrzRXs323Jy7R{w9Swsn>3t6)_S8mm
z&9-{Sp5?<Ep)>7?w?509w}$ufji%V~ZerTE|3I;V*#0`!w)$%)&gmPP7Cbp2*w)sz
z$aMdbB`tsc{E=|vKD<+YQupmk3s>B$__yrpjb)Du*Xd6^^ZS$!FAEdnt5>fIEMzKd
z<d_;cXRcjx;KP9@5n*zFelEVKS0@y7NufY=-`&$HF)!FFb1(kaKI+7NTK40{RnHUe
z>aDoPw9>4iV6CA2*2^cRcW$`h*xxf_UBlV5#e4V4dQQ4v();MqBThDx6M7BC@yC+F
z|L>L)vrko-U#iv<+dj|#top>c`T<uaFJoJ^YSo1;H}-{1;he6jD*8;nvw!X_&PwgX
zgF%m_7nJk&{5r#XMpwo;$ZyuZrT~qW`|tbfO71?%GG8z7Os8*aE8p*UlQdodPRH+j
z#UHDuH77T+{?K};$HCUTVwIPIfP%UC^hJvnRZJ2H_%F35nth_7a@kv(E&F-4=DqkQ
z@#o&j=H)jR{`)H6^q<4iGB-;>s52lkQt~eA;>Bv}E7u%2le40Zk#A4d8ioT0#0#FS
zsLTutTCgqhc-3<8$jla%bVmaT6#)(bzINe2hropyyld|Bmfw}`p51vql85*Ap(i1~
z0)k#Q3VIaCq^G4_x_VVK*FWmt#|fc3tl6b*EqGsS@xJk)aY5<{gQ-*5KTkWrywz$~
zoq%iX`5o4cD;cMsZaw|fOD8LhDdD8lmL~Urpvy`7GaqUz%ypX-9r(mnc=x?q+A|kj
zy8hjE?%cU4DJcRREcbFUGHy&+<9+48jT;iTx2ykNY;2n`%S}b-;PcOlo<U7Y0{IKL
zHFhUH3UlHp%+l)PS;M?5f2GkM<{h(V&EoTS{Uh#r{`S1dA19_VFfcH9y85}Sb4q9e
E09MbEOaK4?
literal 0
HcmV?d00001
diff --git a/scp/images/icons/icon-list-add.png b/scp/images/icons/icon-list-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..425e949d33bd31f44e49feffa45fee319e46af32
GIT binary patch
literal 1260
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}EX7WqAsieW95oy%9SjT%
zoCO|{#S9FLA|TB8+w#GG1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh
zq!<`jGCf@!Ln2zwPL21u94>O)e!H&5QZY5>RoV*0-ma(rE#dKfW~Opjpj7$v3>IcZ
z<%KpcHXS))+cERk1)ZCx4ZNqV<xdMXtB4Gkl&UB#HBDFfRDSSn9tnk+3Z}w|B2f;v
z?%5_-*KPUae(=rgKa+~z*?ynrUtRb7Ps{12lX!V~cf{z01>d}RGbAJ=VQbXUJEeiq
z(c0_d_wQSE^6;gsttO_XD;Y{2KC!g4j97au)bmZ*?!uihEX@a3*v8)25Vdy7)TwK^
z4mhb^TjO;s)x*5rF;FBcD@$qL$&^L=_RV|p<jHaN3l}d6ew^#4o|~I1A}($(*U(z>
z<wfAG-MgpD+`n^Y&nAYcQ>SX%=_fH+$ndqy$i05<oS)wu3&t~Lr@Xdji8S2Ji@(Uy
z{qq0yHoxV;Pqn)aO;mQ@5TU~zr?RwXO76aIZ*RNT*W15+`?j08VHc0z^2zJg>FJ1h
zrz~kpHJW*2V=?<L7TbF>6Mr3FUwHXDd-Fa$p2F8BJ?^+wC7I2>{<PrD4MV-SJscBQ
zdUQEHD4dmDsj8~_<oR>vN#66S_R0Tga>#HKt^fM2pCRXx{o#YU>Y5rF4ob018>L@F
zn>8GM81VDn%*1`KRxYjobF1lj+n>EPkLsqI8}WT!wbDfPhfoDChb!ZaoNX(<D_j$q
z;<4|Y?beJ>8=8vRxa+TO4E%3$UMl_;>mK$weVhrKZ;I{R@b~@aFBR)u*6yG4&1|Rt
zJJtuE*B$m@R}a0=Yc5kW;j+Txt=aZM9r?+1+#;@lYtPQ-b(CE2^VxF4gY!DfCuZK@
zYfy7*bzh!ee6rY2WaeAW1M^l`F3{kr+AFvCV#mddBX7$tU%IrYOY+lq1KBUfSt7df
zdg6I!?=*}*^y$;5j<;W{X3m<$loov{Z@aO<#g$$6C;n2CY|CLVdiTGo;nA7zoTqM{
z%aFA?e&UM&L-W2o6`{rs-VX|*Vq#1Mr|&P0+OG2SqtmI^fgdYZ{#O3>)cU?F!?Gqj
zx8=5L;y1tCIfJ2iw?m-Fs@1C*Pn<f%q@Zb6YI!H{5(n?=M?nlWfefLcp>r&Y)gIl>
zF)J!A4mFhQydCoI=Do*r-rDjV`1i$GBxe=Ff^CZ@oP1Cr;&AJh&Lfj-hIKBCFG_Z~
z?(cY5WxwW3+uFp<%1j1EMo#hZ_ZPMMstI>?dhVGKbmDz^eMDJN?}blZw;DJ6?$*%N
zom%(*QuL`Dv*7YwebqmH-UvN*<jjh!`vTK@;-<44n0t~@Me*vtdCOO67~N(($DE%j
zEiLW8ZQC|I$pf#y3URQU*!(u-@U62u-1G$}{a4*7KI@RU#9?s><|VIkmL*!JM%zts
z>ZoT)(l=0C62h(<81*1MVfpd<$IZ?C3QvE3&fIM3bogDbsL0IKOT%8U6bNK6R75Z|
zh&(WU;NZcQdiyQgMccBOjPdG|8w**a%v4em{O+7uw?)W^H_V~0!GguaEpK9w-K)=j
z9&K$;WqN%opOjpXpOh6lA!ydK`Snxk6V_d0c5UF@;Hf!Z+=+*I|K0jJ*1E3J5AjJ8
Xf4`j0<2ZqVfq}u()z4*}Q$iB}Om;-*
literal 0
HcmV?d00001
diff --git a/scp/images/icons/icon-list.png b/scp/images/icons/icon-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b6ac133d500da5c83c7f97cb07d26ce96d9d736
GIT binary patch
literal 804
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}EX7WqAsieW95oy%9SjT%
zoCO|{#S9FL4j|09>7$V!0|SF(iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$
zQVa}C3q4&NLn2y_PPg{f4istKubg<yLr#OySzwZqAj?rVY3|)8OzgZaM@4Wb-Ewtd
zx)s@>^ov_$<E9Ot_-{ydXe?@Wbx2Y?(X;+Wh0Y$!JKm2{4*4Ft`qnh(8hg9t?;Jxz
z!$c3wen#2+uZk@*vVJcuV2Jgqe6zZx-AQrM$tCJ1mt`j1HfwmdddA6=NillQIUV$-
zKmPMaroqf#NcPF<)VR2~qVn?PuL>;Aym+y~oMCBDXO5Y-)!eW+yZOsw^o-5Su2nTW
zf1dv6qs8aXpHEp^SUmXnG4N`u6XWSkG3_sQo%`^?z^UUG!`G7H;=`v-c`eRevu>S{
ziOHA$3@byrcJ8!{i;Ii-&cejV#>SRax0>n2t5=I6bT;kTvu4lj+tFg;;*0`L2@-CL
z@7S;6QV{CguzkDx%8;Nq1BoTuw{Oo}*vG)IF`_3z=h~zLyBLDJ%F4@k?%Nj@ry-&=
z`>YTLOB8>?EVcCX^fl|(YrlW-qGR%8;bqI0NAoKzU9x%eWEZ7{d*;oPv$MBn+@RCF
zcJ10z28F7=mm?w~7VO@=+s?su@BaP8rKLx2-=6(?USA)d&gmll0KMs}o&MI@GhED=
za`^CJw;8gbtOEVVKmPvv|IY7+1vAc`J-e*cis{9!bKky|c^`^lJn&s`&%S-DqAr^>
z9b90}ur1fv*tmIF=Betcs-)!P=70bGU1PSfu@UHXyLt0w;JttU>{^{18AZB}wjC?1
zuC`toa!QsVz;yfnb-tHVGBZz>R=8$oXY=s!?P4wnQktkR`J{<WUwu{K^*`M2-oLlB
zwGEB4o1dPN@?`hH=gN~$nw<K(IO`ts=FOX9Vq!GbuV3GP^5jX70~sXRE?#kOpIld~
zFYx&BW1+fS)5GjF47+k~XT^RBkk57MSZOaXubo?Q**=D4N_Uxzc08HIz`(%Z>FVdQ
I&MBb@069`*W&i*H
literal 0
HcmV?d00001
--
GitLab