From 3a7cc189a28f3db9b4c6b253cabc138b43dba828 Mon Sep 17 00:00:00 2001 From: marikannan l Date: Tue, 26 Apr 2016 20:04:20 +0530 Subject: [PATCH] Changes #591: view image, dashboard charts height changes --- .htaccess | 2 +- api_explorer/index.html | 2 +- api_explorer/{api.json => swagger.json} | 0 client/js/templates/attachment.jst.ejs | 2 +- client/js/templates/card_attachment.jst.ejs | 2 +- client/js/templates/user_dashboard.jst.ejs | 40 ++++++++++----------- client/js/views/application_view.js | 11 +++--- server/php/download.php | 27 +++++++++----- 8 files changed, 47 insertions(+), 39 deletions(-) rename api_explorer/{api.json => swagger.json} (100%) diff --git a/.htaccess b/.htaccess index a045531a0..aec5942d5 100644 --- a/.htaccess +++ b/.htaccess @@ -9,7 +9,7 @@ Options -Indexes RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^client/img/([a-zA-Z_]*)/([a-zA-Z_]*)/([a-zA-Z0-9_\.]*)$ server/php/image.php?size=$1&model=$2&filename=$3 [L] RewriteRule ^ical/([0-9]*)/([a-zA-Z0-9]*).ics$ server/php/ical.php?id=$1&hash=$2 [L] - RewriteRule ^download/([0-9]*)/([a-zA-Z0-9_\.]*)$ server/php/download.php?id=$1&hash=$2 [L] + RewriteRule ^download/([0-9]*)/([a-zA-Z0-9_\.]*)$ server/php/download.php?id=$1&hash=$2 [QSA,L] RewriteRule ^oauth_callback/([a-zA-Z0-9_\.]*)/([a-zA-Z0-9_\.]*)$ server/php/oauth_callback.php?plugin=$1&code=$2 [L] RewriteRule ^oauth/authorize$ server/php/authorize.php [QSA,L] RewriteRule ^api/(.*)$ server/php/R/r.php?_url=$1 [QSA,L] diff --git a/api_explorer/index.html b/api_explorer/index.html index e75f7b9dc..0077bd162 100644 --- a/api_explorer/index.html +++ b/api_explorer/index.html @@ -28,7 +28,7 @@ if (url && url.length > 1) { url = decodeURIComponent(url[1]); } else { - url = "/api_explorer/api.json"; + url = "/api_explorer/swagger.json"; } window.swaggerUi = new SwaggerUi({ url: url, diff --git a/api_explorer/api.json b/api_explorer/swagger.json similarity index 100% rename from api_explorer/api.json rename to api_explorer/swagger.json diff --git a/client/js/templates/attachment.jst.ejs b/client/js/templates/attachment.jst.ejs index f1341e604..66a6506f4 100644 --- a/client/js/templates/attachment.jst.ejs +++ b/client/js/templates/attachment.jst.ejs @@ -1,5 +1,5 @@ <% if(attachment != null){ %> - + <% if(attachment.get("name").match(/\.(jpg|jpeg|png|gif)$/)){ var picture_path = attachment.showImage('CardAttachment', attachment.attributes.id, 'large_thumb' ); %> diff --git a/client/js/templates/card_attachment.jst.ejs b/client/js/templates/card_attachment.jst.ejs index 8b56f9909..b568bfcfd 100644 --- a/client/js/templates/card_attachment.jst.ejs +++ b/client/js/templates/card_attachment.jst.ejs @@ -1,5 +1,5 @@ <% if(_.isEmpty(attachment.attributes.link) && !_.isEmpty(attachment.attributes.name)){ %> - + <% if(attachment.attributes.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)){ var picture_path = attachment.showImage('CardAttachment', attachment.attributes.id, 'large_thumb' ); %> diff --git a/client/js/templates/user_dashboard.jst.ejs b/client/js/templates/user_dashboard.jst.ejs index dc56ec837..392092494 100644 --- a/client/js/templates/user_dashboard.jst.ejs +++ b/client/js/templates/user_dashboard.jst.ejs @@ -74,14 +74,14 @@
-
-
-
-

<%- i18next.t('Today') %>

+
+
+
+

<%- i18next.t('Today') %>

-
<%- current_month %>
-
<%- d.getDate() %>
+
<%- current_month %>
+
<%- d.getDate() %>
<%- today %>
@@ -95,23 +95,23 @@
-
-
-
-

<%- i18next.t('Week') %>

-
    -
  • +
    +
    +
    +

    <%- i18next.t('Week') %>

    +
      +
    • -
      <%- data.dashboard.week_start_month %>
      -
      <%- data.dashboard.week_start_day %>
      +
      <%- data.dashboard.week_start_month %>
      +
      <%- data.dashboard.week_start_day %>
      <%- i18next.t('Mon') %>
    • <%- i18next.t('to') %>
      • -
    • +
    • -
      <%- data.dashboard.week_end_month %>
      -
      <%- data.dashboard.week_end_day %>
      +
      <%- data.dashboard.week_end_month %>
      +
      <%- data.dashboard.week_end_day %>
      <%- i18next.t('Sun') %>
      • @@ -127,9 +127,9 @@
    -
    -
    -

    <%- i18next.t('Overall') %>

    +
    +
    +

    <%- i18next.t('Overall') %>

    • diff --git a/client/js/views/application_view.js b/client/js/views/application_view.js index 457ce33e0..e5219f6d3 100644 --- a/client/js/views/application_view.js +++ b/client/js/views/application_view.js @@ -745,21 +745,21 @@ App.ApplicationView = Backbone.View.extend({ fillColor: false, lineColor: '#65cca9', width: '750', - height: '200' + height: '100' }); $(this).sparkline($(this).data('doing').split(','), { composite: true, fillColor: false, lineColor: '#eca186', - width: '400', - height: '150' + width: '750', + height: '100' }); $(this).sparkline($(this).data('done').split(','), { composite: true, fillColor: false, lineColor: '#fee3e0', - width: '400', - height: '150' + width: '750', + height: '100' }); }); @@ -769,7 +769,6 @@ App.ApplicationView = Backbone.View.extend({ var _data = {}; _data.title = index.toUpperCase(); _data.value = parseInt(value); - if (_data.title == 'TODO') { _data.color = '#65cca9'; } else if (_data.title == 'DOING') { diff --git a/server/php/download.php b/server/php/download.php index c231893ec..7ab5af455 100644 --- a/server/php/download.php +++ b/server/php/download.php @@ -29,15 +29,24 @@ $add_slash = addcslashes($basename, '"\\'); $quoted = sprintf('"%s"', $add_slash); $size = filesize($file); - header('Content-Description: File Transfer'); - header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename=' . $quoted); - header('Content-Transfer-Encoding: binary'); - header('Connection: Keep-Alive'); - header('Content-length: ' . $size); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); + if(isset($_GET['view'])) { + $path_info = pathinfo($file); + if($path_info['extension'] == 'jpg') { + header('Content-Type: image/jpeg'); + } else { + header('Content-Type: image/'.$path_info['extension']); + } + } else { + header('Content-Description: File Transfer'); + header('Content-Type: application/octet-stream'); + header('Content-Disposition: attachment; filename=' . $quoted); + header('Content-Transfer-Encoding: binary'); + header('Connection: Keep-Alive'); + header('Content-length: ' . $size); + header('Expires: 0'); + header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); + header('Pragma: public'); + } readfile($file); exit; }