Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Niharika29
Niharika29 committed Jun 14, 2016
2 parents fcdd345 + ed70ca9 commit 848bd8f
Show file tree
Hide file tree
Showing 9 changed files with 1,456 additions and 281 deletions.
1,174 changes: 1,138 additions & 36 deletions composer.lock
View file

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions public_html/css/index.css
View file
Expand Up @@ -77,6 +77,8 @@

.row-container {
align-items: center;
/*border-bottom: 1px dashed darkgrey;*/
/*padding: 20px 10px;*/
padding: 10px;
}

Expand Down Expand Up @@ -121,6 +123,10 @@
/*border: 1px solid blue;*/
}

.diff-div-timestamp {
white-space: nowrap;
}

.report-div {
/*border: 1px solid green;*/
}
Expand Down Expand Up @@ -156,3 +162,20 @@ h1 {
/*border: 1px solid green;*/
display: inline-block;
}

.status-div-reviewer {
margin-top: 10px;
white-space: nowrap;
display: none;
text-align: center;
}

.none {
display: none;
}

/* make anchor tags with empty href unclickable */
a[href=''] {
color: inherit;
pointer-events: none;
}
132 changes: 68 additions & 64 deletions public_html/js/index.js
View file
Expand Up @@ -4,39 +4,47 @@
* @param val string Save value 'fixed' or 'false'
*/
function saveState( id, val ) {
buttonId = null;
unusedButtonId = null;
buttonClass = null;
unusedButtonClass = null;
if ( val == 'fixed' ) {
buttonId = '#success' + id;
unusedButtonId = '#danger' + id;
buttonClass = 'success';
unusedButtonClass = 'danger';
} else if ( val == 'false' ) {
buttonId = '#danger' + id;
unusedButtonId = '#success' + id;
unusedButtonClass = 'success';
buttonClass = 'danger';
}
$( buttonId ).removeClass( 'btn-' + buttonClass ).addClass( 'btn-' + buttonClass + '-clicked' ).blur();
$( unusedButtonId ).removeClass( 'btn-' + unusedButtonClass ).addClass( 'btn-secondary' ).prop( 'disabled', 'disabled' ).blur();
var buttonId, unusedButtonId, buttonClass, unusedButtonClass;

$.get( 'review/add',
{ id: id, val: val }
).done( function ( ret ) {
console.log( ret );
if ( ret == 'false' ) {
$( buttonId ).addClass( 'btn-' + buttonClass ).removeClass( 'btn-' + buttonClass + '-clicked' ).blur();
$( unusedButtonId ).removeClass( 'btn-secondary' ).prop( 'disabled', false ).addClass( 'btn-' + unusedButtonClass );
alert( 'There was an error in connecting to database.' );
} else if ( ret == 'Unauthorized' ) {
alert( 'You need to be logged in to be able to review.' );
$( buttonId ).addClass( 'btn-' + buttonClass ).removeClass( 'btn-' + buttonClass + '-clicked' ).blur();
$( unusedButtonId ).removeClass( 'btn-secondary' ).prop( 'disabled', false ).addClass( 'btn-' + unusedButtonClass );
}
}
);
if ( val === 'fixed' ) {
buttonId = '#success' + id;
unusedButtonId = '#danger' + id;
buttonClass = 'success';
unusedButtonClass = 'danger';
} else if ( val === 'false' ) {
buttonId = '#danger' + id;
unusedButtonId = '#success' + id;
unusedButtonClass = 'success';
buttonClass = 'danger';
}
$( buttonId ).removeClass( 'btn-' + buttonClass ).addClass( 'btn-' + buttonClass + '-clicked' ).blur();
$( unusedButtonId ).removeClass( 'btn-' + unusedButtonClass ).addClass( 'btn-secondary' ).prop( 'disabled', 'disabled' ).blur();

$.ajax( {
url: 'review/add',
data: {
id: id,
val: val
},
dataType: 'json'
} ).done( function ( ret ) {
if ( ret.user ) {
$reviewerNode = $( '.status-div-reviewer-' + id );
$reviewerNode.find( '.reviewer-link' ).prop( 'href', ret.userpage ).text( ret.user );
$reviewerNode.find( '.reviewer-timestamp' ).text( ret.timestamp );
$reviewerNode.fadeIn( 'slow' );
$( unusedButtonId ).removeClass( 'btn-secondary' ).prop( 'disabled', true ).addClass( 'btn-' + unusedButtonClass );
} else {
if ( ret.error === 'Unauthorized' ) {
alert( 'You need to be logged in to be able to review.' );
} else {
alert( 'There was an error in connecting to database.' );
}
$( buttonId ).addClass( 'btn-' + buttonClass ).removeClass( 'btn-' + buttonClass + '-clicked' ).blur();
$( unusedButtonId ).removeClass( 'btn-secondary' ).prop( 'disabled', false ).addClass( 'btn-' + unusedButtonClass );
}
}
);
}

/**
Expand All @@ -47,36 +55,32 @@ function saveState( id, val ) {
* @param diffId Oldid of diff
*/
function toggleComparePane( id, index, copyvio, diffId ) {
var compareDiv = '#comp' + id + '-' + index;
$( compareDiv ).slideToggle( 500 );
$.ajax(
{
type: 'GET',
url: 'https://tools.wmflabs.org/copyvios/api.json',
data: {
oldid: diffId,
url: copyvio,
action: 'compare',
project: 'wikipedia',
lang: 'en',
format: 'json',
detail: 'true'
},
dataType: 'json',
jsonpCallback: 'callback',
success: function ( ret ) {
console.log( 'XHR Success' );
if ( ret.detail ) {
$( compareDiv ).find( '.compare-pane-left' ).html( ret.detail.article );
$( compareDiv ).find( '.compare-pane-right' ).html( ret.detail.source );
} else {
$( compareDiv ).find( '.compare-pane-left' ).html( '<span class="text-danger">Error! API returned no data.</span>' );
$( compareDiv ).find( '.compare-pane-right' ).html( '<span class="text-danger">Error! API returned no data.</span>' );
}
},
error: function () {
console.log( 'XHR Fail' );
}
}
);
var compareDiv = '#comp' + id + '-' + index;
$( compareDiv ).slideToggle( 500 );
$.ajax(
{
type: 'GET',
url: 'https://tools.wmflabs.org/copyvios/api.json',
data: {
oldid: diffId,
url: copyvio,
action: 'compare',
project: 'wikipedia',
lang: 'en',
format: 'json',
detail: 'true'
},
dataType: 'json',
jsonpCallback: 'callback'
} ).done( function ( ret ) {
console.log( 'XHR Success' );
if ( ret.detail ) {
$( compareDiv ).find( '.compare-pane-left' ).html( ret.detail.article );
$( compareDiv ).find( '.compare-pane-right' ).html( ret.detail.source );
} else {
$( compareDiv ).find( '.compare-pane-left' ).html( '<span class="text-danger">Error! API returned no data.</span>' );
$( compareDiv ).find( '.compare-pane-right' ).html( '<span class="text-danger">Error! API returned no data.</span>' );
}
}
);
}
160 changes: 80 additions & 80 deletions public_html/templates/base.html
View file
Expand Up @@ -2,89 +2,89 @@

<html lang="en">
<head>
<title>CopyPatrol</title>
{% block stylesheets %}
<link href="//tools-static.wmflabs.org/cdnjs/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css"
rel="stylesheet">
<link href="{{ siteUrl('css/index.css') }}" type="text/css" rel="stylesheet"/>
{% endblock %}
{% block scripts %}
<script src="//tools-static.wmflabs.org/cdnjs/ajax/libs/jquery/1.12.0/jquery.min.js"
type="text/javascript"></script>
<script src="//tools-static.wmflabs.org/cdnjs/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"
type="text/javascript"></script>
<script src="{{ siteUrl('js/index.js') }}" type="text/javascript"></script>
<script type="text/javascript">
$( document ).ready( function () {
$( '[data-toggle="tooltip"]' ).tooltip();
} );
</script>
{% endblock %}
<title>CopyPatrol</title>
{% block stylesheets %}
<link href="//tools-static.wmflabs.org/cdnjs/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css"
rel="stylesheet"/>
<link href="{{ siteUrl('css/index.css') }}" type="text/css" rel="stylesheet"/>
{% endblock %}
{% block scripts %}
<script src="//tools-static.wmflabs.org/cdnjs/ajax/libs/jquery/1.12.0/jquery.min.js"
type="text/javascript"></script>
<script src="//tools-static.wmflabs.org/cdnjs/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"
type="text/javascript"></script>
<script src="{{ siteUrl('js/index.js') }}" type="text/javascript"></script>
<script type="text/javascript">
$( document ).ready( function () {
$( '[data-toggle="tooltip"]' ).tooltip();
} );
</script>
{% endblock %}
</head>
<body>
<div id="body">
<div id="top-banner">
<h1>CopyPatrol</h1>
{% if user %}
<a href='{{ urlFor( 'logout' ) }}' id="login-btn" class="btn btn-sm btn-default">
<span class=" glyphicon glyphicon-log-in"></span> Logout <br>
<small>You are logged in as {{ user.name }}</small>
</a>
{% else %}
<a href='{{ urlFor( 'oauth_init' ) }}' id="login-btn" class="btn btn-sm btn-default">
<span class=" glyphicon glyphicon-log-in"></span> Login
</a>
{% endif %}
</div>
{% block banners %}
<div class="alert alert-warning alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<strong>Hello!</strong> This is a web-version of Plagiabot. Database writes for this tool are <b>now
enabled</b>. You can start conducting reviews after you log in. You can drop your feedback
<a href="https://en.wikipedia.org/wiki/User_talk:EranBot/Copyright/rc"> here</a>.
</div>
{% block flashes %}
{% if flash|default(false) %}
{% if flash.error|default(false) %}
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.error }}
</div>
{% endif %}
{% if flash.success|default(false) %}
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.info }}
</div>
{% endif %}
{% if flash.warning|default(false) %}
<div class="alert alert-warning alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.info }}
</div>
{% endif %}
{% if flash.info|default(false) %}
<div class="alert alert-info alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.info }}
</div>
{% endif %}
{% endif %}
{% endblock flashes %}
{% endblock %}
{% block rowheader %}
<div class="header-div container-fluid">
<div class="header-col col-sm-3 text-center">Page</div>
<div class="header-col col-sm-1 text-center">Diff</div>
<div class="header-col col-sm-2 text-center">Editor</div>
<div class="header-col col-sm-3 text-center">Wikiprojects</div>
<div class="header-col col-sm-2 text-center">Review</div>
</div>
{% endblock %}
<div class="record-container">
{% block records %}
{% endblock %}
</div>
<div id="top-banner">
<h1>CopyPatrol</h1>
{% if user %}
<a href='{{ urlFor( 'logout' ) }}' id="login-btn" class="btn btn-sm btn-default">
<span class=" glyphicon glyphicon-log-in"></span> Logout <br>
<small>You are logged in as {{ user.name }}</small>
</a>
{% else %}
<a href='{{ urlFor( 'oauth_init' ) }}' id="login-btn" class="btn btn-sm btn-default">
<span class=" glyphicon glyphicon-log-in"></span> Login
</a>
{% endif %}
</div>
{% block banners %}
<div class="alert alert-warning alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<strong>Hello!</strong> This is a web-version of Plagiabot. Database writes for this tool are <b>now
enabled</b>. You can start conducting reviews after you log in. You can drop your feedback
<a href="https://en.wikipedia.org/wiki/User_talk:EranBot/Copyright/rc"> here</a>.
</div>
{% block flashes %}
{% if flash|default(false) %}
{% if flash.error|default(false) %}
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.error }}
</div>
{% endif %}
{% if flash.success|default(false) %}
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.info }}
</div>
{% endif %}
{% if flash.warning|default(false) %}
<div class="alert alert-warning alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.info }}
</div>
{% endif %}
{% if flash.info|default(false) %}
<div class="alert alert-info alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{ flash.info }}
</div>
{% endif %}
{% endif %}
{% endblock flashes %}
{% endblock %}
{% block rowheader %}
<div class="header-div container-fluid">
<div class="header-col col-sm-3 text-center">Page</div>
<div class="header-col col-sm-1 text-center">Diff</div>
<div class="header-col col-sm-2 text-center">Editor</div>
<div class="header-col col-sm-3 text-center">Wikiprojects</div>
<div class="header-col col-sm-2 text-center">Review</div>
</div>
{% endblock %}
<div class="record-container">
{% block records %}
{% endblock %}
</div>
</div>
</body>
</html>

0 comments on commit 848bd8f

Please sign in to comment.