From c09e86dae9701b034d6d8d57e9f273f99caf47ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Tue, 19 Aug 2014 16:33:20 +0200 Subject: [PATCH] new styles for web browser buttons (import/read/browse) fixed folder_iphone.tpl --- .../server/controllers/foldercontroller.cpp | 12 ++++++------ release/server/docroot/css/styles_ipad.css | 4 ++-- release/server/docroot/css/styles_iphone.css | 4 ++-- release/server/templates/folder_iphone.tpl | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/YACReaderLibrary/server/controllers/foldercontroller.cpp b/YACReaderLibrary/server/controllers/foldercontroller.cpp index 0531f000..847e0f58 100644 --- a/YACReaderLibrary/server/controllers/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/foldercontroller.cpp @@ -174,13 +174,13 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) else t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png"); - t.setVariable(QString("element%1.browse").arg(i),QString("browse").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id))); + t.setVariable(QString("element%1.browse").arg(i),QString("BROWSE").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id))); t.setVariable(QString("element%1.cover.browse").arg(i),QString("").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id))); t.setVariable(QString("element%1.cover.browse.end").arg(i),""); //t.setVariable(QString("element%1.url").arg(i),"/library/"+libraryName+"/folder/"+QString("%1").arg(folderContent.at(i + (page*10))->id)); //t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id)); - t.setVariable(QString("element%1.download").arg(i),QString("import").arg("/library/"+QString::number(libraryId)+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id))); + t.setVariable(QString("element%1.download").arg(i),QString("IMPORT").arg("/library/"+QString::number(libraryId)+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id))); t.setVariable(QString("element%1.read").arg(i),""); t.setVariable(QString("element%1.size").arg(i),""); @@ -194,15 +194,15 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) t.setVariable(QString("element%1.browse").arg(i),""); //t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/comic/"+QString("%1").arg(comic->id)); if(!session.isComicOnDevice(comic->info.hash) && !session.isComicDownloaded(comic->info.hash)) - t.setVariable(QString("element%1.download").arg(i),QString("import").arg("/library/"+QString::number(libraryId)+"/comic/"+QString("%1").arg(comic->id))); + t.setVariable(QString("element%1.download").arg(i),QString("IMPORT").arg("/library/"+QString::number(libraryId)+"/comic/"+QString("%1").arg(comic->id))); else if (session.isComicOnDevice(comic->info.hash)) - t.setVariable(QString("element%1.download").arg(i),QString("
imported
")); + t.setVariable(QString("element%1.download").arg(i),QString("
IMPORTED
")); else - t.setVariable(QString("element%1.download").arg(i),QString("
importing
")); + t.setVariable(QString("element%1.download").arg(i),QString("
IMPORTING
")); //t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png"); - t.setVariable(QString("element%1.read").arg(i),QString("read").arg("/library/"+QString::number(libraryId)+"/comic/"+QString("%1").arg(comic->id)+"/remote")); + t.setVariable(QString("element%1.read").arg(i),QString("READ").arg("/library/"+QString::number(libraryId)+"/comic/"+QString("%1").arg(comic->id)+"/remote")); t.setVariable(QString("element%1.image.url").arg(i),QString("/library/%1/cover/%2.jpg").arg(libraryId).arg(comic->info.hash)); diff --git a/release/server/docroot/css/styles_ipad.css b/release/server/docroot/css/styles_ipad.css index b89a6bf8..8f415579 100644 --- a/release/server/docroot/css/styles_ipad.css +++ b/release/server/docroot/css/styles_ipad.css @@ -278,7 +278,7 @@ width: 158px; { width: 60px; background: url("/images/browse.png") no-repeat scroll 0 0 transparent; - background-position: 16px 5px; + background-position: 1px 6px; background-size: 7px 7px; border: none; text-align:right; @@ -307,7 +307,7 @@ width: 158px; { width: 60px; background: url("/images/read.png") no-repeat scroll 0 0 transparent; - background-position: 24px 5px; + background-position: 18px 5px; background-size: 7px 9px; border: none; text-align:right; diff --git a/release/server/docroot/css/styles_iphone.css b/release/server/docroot/css/styles_iphone.css index 5a3cd9b1..fdf3dc0d 100644 --- a/release/server/docroot/css/styles_iphone.css +++ b/release/server/docroot/css/styles_iphone.css @@ -276,7 +276,7 @@ width: 212px; { width: 60px; background: url("/images/browse.png") no-repeat scroll 0 0 transparent; - background-position: 16px 5px; + background-position: 1px 6px; background-size: 7px 7px; border: none; text-align:right; @@ -305,7 +305,7 @@ width: 212px; { width: 60px; background: url("/images/read.png") no-repeat scroll 0 0 transparent; - background-position: 24px 5px; + background-position: 18px 5px; background-size: 7px 9px; border: none; text-align:right; diff --git a/release/server/templates/folder_iphone.tpl b/release/server/templates/folder_iphone.tpl index 7b8e2bc9..e6512c27 100644 --- a/release/server/templates/folder_iphone.tpl +++ b/release/server/templates/folder_iphone.tpl @@ -49,7 +49,7 @@ {loop element}
  • - {cover.browse} {cover.browse.end} + {element.cover.browse} {element.cover.browse.end}

    {element.name}