Commit Graph

98 Commits

Author SHA1 Message Date
080c8ab136 fix #373 2013-03-08 07:37:05 +01:00
0824334d5f Merge branch 'upstream' into redeem_dlg
Conflicts:
	code/redeeming.js
2013-03-07 08:35:44 +01:00
967578f7ea fixed codingstyle and removed coda font 2013-03-05 13:35:09 +01:00
4024c67f3a Make style of buttons in dialog consistant. 2013-03-05 16:23:38 +08:00
0afc26af4a new redeem dialog content 2013-03-05 08:52:46 +01:00
492f0846f8 Fixed some style issues 2013-03-04 21:02:25 +01:00
f50a7eb63c new style for alert windows 2013-03-04 12:32:22 +01:00
5513ea13eb Resolve conflict and sync 2013-03-02 21:31:12 -08:00
0ba8631b82 MU counts for fields with limiting for small fields
Only at higher zoom levels will counts for small fields show.
2013-03-02 21:25:03 -08:00
ee05477b2b Merge pull request #353 from cmrn/signout-link
Added sign out link when hovering over name (fixes #352)
2013-03-02 07:11:43 -08:00
75dea672f3 Inital stab at mu counts for fields
Still needs work on when not to display, maybe based on field area and
zoom level?
2013-03-02 05:56:29 -08:00
7207a1f50d most likely fix #341.
The fix has been ported to 0.7.x, too. The layer chooser should be
much more compact on chrome now.
2013-03-02 12:03:23 +01:00
32ca78b1d7 Added sign out link when hovering over name (fixes #352) 2013-03-01 13:31:13 +11:00
0767230489 Make changes asked by breunigs 2013-02-25 17:55:37 +01:00
107f4689e9 Replace gmaps-link by popup with qrcode and links
If you want to use your smartphone for navigation, you can now just scan
the qr-code and (if your scanner-app supports it) directly input the
locations to your navigation-app.
Additionally a link to the location in gapps and OSM will be displayed.
2013-02-25 16:21:03 +01:00
d644ef64bd implement jqueryui dialog replacements.
For now only alert windows are converted automatically. You can alert custom
HTML code like so: alert('<strong>herp a derp</strong>', true);

Main can use this feature immediately, all plugins that are advertized to be
stable may only use this once 0.7 is released.
2013-02-22 11:23:44 +01:00
a23f1ecb29 fix space 2013-02-21 22:13:04 +01:00
11ca5c94fd Update 2013-02-21 09:18:38 -06:00
6bc5156e29 Style "Nigs" 2013-02-21 09:07:27 -06:00
2396f34e7a fix text wrapping style issues in player tracker (fixes #212) 2013-02-19 08:50:28 +01:00
6884e967dc different fix for #187 and #192. Please report back if it works. 2013-02-17 00:20:40 +01:00
7438cd6e51 broke the alignment for resos and random details 2013-02-16 16:15:07 +01:00
7b3865e170 fix #185 2013-02-16 15:27:37 +01:00
a2369b5119 avoid off by a few issues for people who zoom their browser. 2013-02-16 15:21:24 +01:00
348202f75d fix #187 2013-02-16 15:05:55 +01:00
e242ca6ef0 avoid stretching chat messages if there are too few for the available space 2013-02-16 11:46:43 +01:00
5445006d5a make chat copy&paste friendly again 2013-02-16 10:56:58 +01:00
2023e33567 more work for #179.
Due to changed display of the portal image it now doesn’t flicker anymore,
which simplifies code a lot.
2013-02-16 10:02:18 +01:00
43d9251c57 part of #179 2013-02-16 08:33:59 +01:00
f1467dd1e9 remove more deprecated stuff 2013-02-15 16:23:11 +01:00
98f22c4e48 see if this fixes the level misalignment 2013-02-14 19:04:31 +01:00
72842612cb more backwards compat 2013-02-14 09:51:02 +01:00
485b1c543b fix #95 (thanks jonatkins) 2013-02-14 08:47:49 +01:00
ae9eaba8c2 further refine tooltips to be more visible against the map 2013-02-13 17:45:07 +01:00
ae65dff2d9 * ditch jQueryUI vanilla styles in favor of own ones.
* disable tracking for tooltips and make them behave more like regular ones
  (this also stops my fan from spinning up when using the intel map)

Improvements welcome. Tooltips are currently placed at the bottom of the
element instead of next to cursor. It seems it’s either tracking or placing
it not anywhere where one would expect a tooltip. I immediately regret
having chosen jQueryUI. It’s not very flexible and has awkward defaults.
2013-02-13 04:10:40 +01:00
360f6f8336 rework chat handling completely
The old system was getting too complicated to add new features to.
The new one should be easier to understand and will be explained
below. This patch should fix #140 and fix #16.

There are several places where new data requests may come from:
- chat.needMoreMessages checks if we are scrolled too far up or
  there is no scrollbar. It then requests new messages.
- scrolling up
- switching the chat tab via chat.chooser
- auto refresh
- once on boot
The latter two always request both types of chat.

Faction and public are handled the same way. Public is later split
into categories. I will explain the faction chat here because it’s
easier.

It starts in chat.requestFaction. This will initialize the query to
the server for data. The exact query is determined by chat.
genPostData. There can only be one faction chat request at a time.
Clearing on map move is handled automatically in code/requests.js.

Let’s assume the data query is successful. It is now passed to
chat.handleFaction which runs some basic checks before the data is
processed and stored in chat._factionData. This is done by chat.
writeDataToHash. The hash keys are the message GUIDs to avoid
duplicates. The hash values are an array of timestamp, processed
message and other meta data.

There is only one way to render faction chat, so data is directly
handed to chat.renderFaction which immediately hands it to chat
.renderData. renderData discards the GUIDs and sorts the values
by their timestamp. It then iterates over the data to insert
date break lines and finally renders the data in the DOM. It also
does some magic to keep the correct scrolling position.

Chat data will be cleared on map move or zoom. However, the
display is not refreshed, so the old, invalid chat data is still
displayed. Only once the data query is finished the data is
rendered. The upside is that small map operations within your
local area appear to never lose their chat data. Downside is that
there’s invalid chat for some time when changing cities.
2013-02-13 02:52:27 +01:00
8fc2a891db Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages 2013-02-12 10:01:49 +01:00
331d9a3781 add debugging/console capability to devices where it is not available or easily accessibile 2013-02-12 10:01:21 +01:00
f9f1cc1266 Added details on how to find updates to error message 2013-02-12 09:23:28 +11:00
e761a01aed fixed various minor sidebar layout issues 2013-02-12 08:58:06 +11:00
4d0c0356fe fix breakage in Chrome 2013-02-11 18:55:14 +01:00
43245bf425 add update notice for old users and hide it for all on the current version 2013-02-11 18:17:52 +01:00
9416aeb50f replace unicode arrows with CSS tricks that should work on all platforms (patch by mledoze). Fixes #98, #116 2013-02-11 17:32:02 +01:00
14cc1263f3 undo backwards compat changes, they break the sidebar 2013-02-11 17:31:14 +01:00
6599f1375a Remove border on #scrollwrapper as it was duplicating border on #sidebar 2013-02-12 00:20:22 +11:00
0c3a9ef4fc Made sidebar look less broken when using out-of-date plugin 2013-02-12 00:14:27 +11:00
8b94121bb2 z-index for #scrollwallpaper
had problem with sidebar not showing in Chrome 25, the sidebar got under the map layer. Added z-index 1001;
2013-02-11 13:48:05 +01:00
4a45570f40 make more use of the empty space below the sidebar now that there’s a map rendered behind it all the time 2013-02-11 12:10:40 +01:00
1de0e166e0 Merge pull request #99 from cmrn/transparent-sidebar
Transparent sidebar, like the chat box (patch by cmrn)
2013-02-11 02:45:13 -08:00
543fc5ce5b improve portal number separation from background (trick by jonatkins) 2013-02-11 08:57:26 +01:00