Commit 294dfd10 authored by Daniel Molkentin's avatar Daniel Molkentin

Adjust to changes in qdoc from Qt 4.7.

Reviewed-By: Leena Miettinen
parent 0ad6dfe0
......@@ -19,14 +19,13 @@ HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
$$PWD/addressbook-sdk.qdoc \
$$PWD/qt-defines.qdocconf \
$$PWD/qt-html-templates.qdocconf \
$$PWD/qtcreator.qdocconf \
$$PWD/qtcreator-online.qdocconf
$$PWD/qtcreator.qdocconf
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
html_docs.commands = $$QDOC -creator $$PWD/qtcreator.qdocconf
html_docs.depends += $$HELP_DEP_FILES
html_docs.files = $$QHP_FILE
html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf
html_docs_online.commands = $$QDOC -online $$PWD/qtcreator.qdocconf
html_docs_online.depends += $$HELP_DEP_FILES
qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
......
doc/templates/images/bg_l.png

139 Bytes | W: | H:

doc/templates/images/bg_l.png

100 Bytes | W: | H:

doc/templates/images/bg_l.png
doc/templates/images/bg_l.png
doc/templates/images/bg_l.png
doc/templates/images/bg_l.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bg_l_blank.png

123 Bytes | W: | H:

doc/templates/images/bg_l_blank.png

84 Bytes | W: | H:

doc/templates/images/bg_l_blank.png
doc/templates/images/bg_l_blank.png
doc/templates/images/bg_l_blank.png
doc/templates/images/bg_l_blank.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bg_r.png

136 Bytes | W: | H:

doc/templates/images/bg_r.png

96 Bytes | W: | H:

doc/templates/images/bg_r.png
doc/templates/images/bg_r.png
doc/templates/images/bg_r.png
doc/templates/images/bg_r.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/box_bg.png

129 Bytes | W: | H:

doc/templates/images/box_bg.png

89 Bytes | W: | H:

doc/templates/images/box_bg.png
doc/templates/images/box_bg.png
doc/templates/images/box_bg.png
doc/templates/images/box_bg.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/breadcrumb.png

195 Bytes | W: | H:

doc/templates/images/breadcrumb.png

134 Bytes | W: | H:

doc/templates/images/breadcrumb.png
doc/templates/images/breadcrumb.png
doc/templates/images/breadcrumb.png
doc/templates/images/breadcrumb.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bullet_gt.png

185 Bytes | W: | H:

doc/templates/images/bullet_gt.png

124 Bytes | W: | H:

doc/templates/images/bullet_gt.png
doc/templates/images/bullet_gt.png
doc/templates/images/bullet_gt.png
doc/templates/images/bullet_gt.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bullet_sq.png

117 Bytes | W: | H:

doc/templates/images/bullet_sq.png

74 Bytes | W: | H:

doc/templates/images/bullet_sq.png
doc/templates/images/bullet_sq.png
doc/templates/images/bullet_sq.png
doc/templates/images/bullet_sq.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bullet_up.png

253 Bytes | W: | H:

doc/templates/images/bullet_up.png

210 Bytes | W: | H:

doc/templates/images/bullet_up.png
doc/templates/images/bullet_up.png
doc/templates/images/bullet_up.png
doc/templates/images/bullet_up.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/page_bg.png

126 Bytes | W: | H:

doc/templates/images/page_bg.png

84 Bytes | W: | H:

doc/templates/images/page_bg.png
doc/templates/images/page_bg.png
doc/templates/images/page_bg.png
doc/templates/images/page_bg.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -63,11 +63,9 @@ function processNokiaData(response){
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
lookupCount++;
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
$('#ul001').append(full_li_element);
$('#ul001 .defaultLink').css('display','none');
......@@ -77,7 +75,6 @@ function processNokiaData(response){
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
articleCount++;
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
......@@ -103,10 +100,13 @@ function processNokiaData(response){
if(i==propertyTags.length){$('#pageType').removeClass('loading');}
}
if(lookupCount > 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult hit\">Found ' + lookupCount + ' hits</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
if(articleCount > 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul002 li').css('display','block');}
if(exampleCount > 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul003 li').css('display','block');}
if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
if(lookupCount == 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
if(articleCount == 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
if(exampleCount == 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
// reset count variables;
lookupCount=0;
articleCount = 0;
......@@ -121,6 +121,7 @@ function CheckEmptyAndLoadList()
var pageVal = $('title').html();
$('#feedUrl').remove();
$('#pageVal').remove();
$('.menuAlert').remove();
$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
$('.liveResult').remove();
......@@ -160,7 +161,8 @@ else
var searchString = $('#pageType').val() ;
if ((searchString == null) || (searchString.length < 3)) {
$('#pageType').removeClass('loading');
$('.liveResult').remove(); // replaces removeResults();
$('.liveResult').remove();
$('.searching').remove();
CheckEmptyAndLoadList();
$('.report').remove();
// debug$('.content').prepend('<li>too short or blank</li>'); // debug
......@@ -169,9 +171,8 @@ else
if (this.timer) clearTimeout(this.timer);
this.timer = setTimeout(function () {
$('#pageType').addClass('loading');
// debug$('.content').prepend('<li>new search started </li>');// debug
// debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug
$('.searching').remove();
$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
$.ajax({
contentType: "application/x-www-form-urlencoded",
url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
......@@ -180,9 +181,10 @@ else
type: 'post',
success: function (response, textStatus) {
$('.liveResult').remove(); // replaces removeResults();
$('#pageType').removeClass('loading');
$('.liveResult').remove();
$('.searching').remove();
$('#pageType').removeClass('loading');
$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
processNokiaData(response);
}
......
......@@ -59,9 +59,20 @@ var narrowInit = function() {
}
$(document).ready(function(){
if ($('body').hasClass('narrow')) {
/* if ($('body').hasClass('narrow')) {
narrowInit();
}
*/
if($(window).width()<600) {
$('body').addClass('narrow');
if ($("#narrowsearch").length == 0) {
narrowInit();
}
}
else {
$('body').removeClass('narrow');
}
});
$(window).bind('resize', function () {
......
......@@ -15,7 +15,12 @@
}
.narrow .footer {
margin: 0;
margin: 0px;
}
.creator .header, .creator .header .content, .creator .footer, .creator .wrapper {
margin: 0px;
min-width: 300px;
}
.narrow .header
{
......@@ -49,7 +54,7 @@
.narrow .header .qtref a
{
color: #363534;
color: #00732F;
}
.narrow .header .qtref span
......@@ -98,7 +103,7 @@
}
.narrow .header #shortCut ul li a
{
color: #44a51c;
color: #00732F;
}
.narrow .wrapper .hd
......@@ -126,6 +131,11 @@
margin: 0 5px 0 5px;
}
.creator .wrap
{
margin: 0px;
background:#FFFFFF;
}
.narrow .wrap .toolbar
{
border-bottom: none;
......@@ -135,7 +145,14 @@
{
padding-top: 15px;
}
.creator .wrap .content
{
padding-top: 10px;
}
.creator .wrap .content .guide
{
padding-top: 15px;
}
.narrow .wrap .feedback
{
display: none;
......
This diff is collapsed.
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