diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/head.tpl | 3 | ||||
| -rw-r--r-- | view/oembed_video.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 21 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 21 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 32 | ||||
| -rw-r--r-- | view/theme/quattro/quattro.less | 23 | ||||
| -rw-r--r-- | view/theme/quattro/style.css | 24 | ||||
| -rw-r--r-- | view/theme/testbubble/style.css | 40 |
8 files changed, 159 insertions, 7 deletions
diff --git a/view/head.tpl b/view/head.tpl index b6d78da39..752915b14 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -17,11 +17,14 @@ <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> <script type="text/javascript" src="$baseurl/js/jquery.js" ></script> +<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script> +<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script> <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script> <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script> <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script> <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script> <script type="text/javascript" src="$baseurl/js/acl.js" ></script> +<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script> <script type="text/javascript" src="$baseurl/js/main.js" ></script> <script> diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl index 29b5149ba..5824d8d4e 100644 --- a/view/oembed_video.tpl +++ b/view/oembed_video.tpl @@ -1,4 +1,4 @@ -<a href='$embedurl' onclick='this.innerHTML=unescape("$escapedhtml").replace(/\+/g," "); return false;' style='float:left; margin: 1em; position: relative;'> +<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> <img width='$tw' height='$th' src='$turl' > <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> </a> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 3c92a877b..0d8b54698 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1250,3 +1250,24 @@ footer { display: block; margin: 50px 20%; clear: both; } /** /acl **/ +/* autocomplete popup */ +.acpopup { + max-height:150px; + background-color:#555753; + color: #FFFFFF; + overflow:auto; + z-index:100000; + border:1px solid #cccccc; +} +.acpopupitem { + background-color:#555753; padding: 4px; + clear:left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} + +.acpopupitem.selected { + color: #2e3436; background-color: #eeeeec; +} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b870f6bd5..d595c7495 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2833,3 +2833,24 @@ a.mail-list-link { .type-text { background-position: -60px 0px; } .type-unkn { background-position: -80px 0px; } + +/* autocomplete popup */ +.acpopup { + max-height:150px; + background-color:#ffffff; + overflow:auto; + z-index:100000; + border:1px solid #cccccc; +} +.acpopupitem { + background-color:#ffffff; padding: 4px; + clear:left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} + +.acpopupitem.selected { + color: #FFFFFF; background: #3465A4; +} diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 447072390..42b99b08c 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2745,9 +2745,31 @@ a.mail-list-link { margin-top: 10px; } -.type-video { background-position: 0px; 0px; } -.type-image { background-position: -20px; 0px; } -.type-audio { background-position: -40px; 0px; } -.type-text { background-position: -60px; 0px; } -.type-unkn { background-position: -80px; 0px; } +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +/* autocomplete popup */ +.acpopup { + max-height:150px; + background-color:#ffffff; + overflow:auto; + z-index:100000; + border:1px solid #cccccc; +} +.acpopupitem { + background-color:#ffffff; padding: 4px; + clear:left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} + +.acpopupitem.selected { + color: #FFFFFF; background: #3465A4; +} + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 1fbeb7ae2..ea699d5c6 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -192,6 +192,29 @@ ul.menu-popup { } +/* autocomplete popup */ +.acpopup { + max-height:150px; + background-color:@MenuBg; + color: @Menu; + border:1px solid #MenuBorder; + overflow:auto; + z-index:100000; + .shadow(); +} +.acpopupitem { + color: @MenuItem; padding: 4px; + clear:left; + img { + float: left; + margin-right: 4px; + } + &.selected{ + background-color: @MenuItemHoverBg; + } +} + + #nav-notifications-menu { width: 400px; img { float: left; margin-right: 5px; } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 585214233..95c3d087e 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -388,6 +388,30 @@ ul.menu-popup .empty { text-align: center; color: #9eabb0; } +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} #nav-notifications-menu { width: 400px; } diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index b7c20ab17..9c04ec4ba 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -823,7 +823,7 @@ profile-jot-banner-wrapper { /* ======== */ .tabs { - width: 500px; + min-width: 500px; list-style: none; padding: 10px; margin: 0px 0px 10px 0px; @@ -3086,3 +3086,41 @@ ul.menu-popup { #jGrowl { z-index: 20000; } + +/* autocomplete popup */ +.acpopup { + max-height:150px; + overflow:auto; + z-index:100000; + + color: #2e3436; + border-top: 0px; + background: #eeeeee; + border-right: 1px solid #dddddd; + border-left: 1px solid #dddddd; + border-bottom: 1px solid #dddddd; + -webkit-border-radius: 0px 5px 5px 5px; + -moz-border-radius: 0px 5px 5px 5px; + border-radius: 0px 5px 5px 5px; + -moz-box-shadow: 3px 3px 4px #959494; + -webkit-box-shadow: 3px 3px 4px #959494; + box-shadow: 3px 3px 4px #959494; + +} +.acpopupitem { + color: #2e3436; padding: 4px; + clear:left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} + +.acpopupitem.selected { + color: #efefef; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); + background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); + background-color:#b20202; + order-bottom: none; +} |