display image if different. Display fn.oc sn of possible merges #1454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Radio buttons are not working! see issue #1455 |
Swrup
reviewed
Apr 21, 2023
| @@ -95,11 +96,20 @@ let print_differences conf base branches p1 p2 = | |||
| match Image.get_portrait conf base p with | |||
| | Some (`Url url) -> | |||
| ({|<img src="|} ^<^ escape_html url | |||
| ^>^ {|" style="max-width:75px;max-height:100px">|} | |||
| ^>^ {|" style="max-width:75px;max-height:100px">|} ^ url | |||
There was a problem hiding this comment.
Why do we apply escape_html to url?
This print the url as text next to the image?
There was a problem hiding this comment.
We can probably suppress this escape_url.
The same comment applies to string_of_image_url in perso.ml
|
This was the previous situation. We could put it as title under the img !Envoyé de mon iPhoneLe 21 avr. 2023 à 12:27, Swrup ***@***.***> a écrit :
@Swrup commented on this pull request.
In lib/mergeIndDisplay.ml:
@@ -95,11 +96,20 @@ let print_differences conf base branches p1 p2 =
match Image.get_portrait conf base p with
| Some (`Url url) ->
({|<img src="|} ^<^ escape_html url
- ^>^ {|" style="max-width:75px;max-height:100px">|}
+ ^>^ {|" style="max-width:75px;max-height:100px">|} ^ url
Why do we apply escape_html to url?
This print the url as text next to the image?
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: ***@***.***>
|
Swrup
reviewed
Apr 21, 2023
| style="max-width:75px;max-height:100px"> %s|} | ||
| (commd conf :> string) | ||
| (string_of_int | ||
| @@ int_of_float (mod_float s.Unix.st_mtime (float_of_int max_int))) |
There was a problem hiding this comment.
why do we need this information to make src from a path?
There was a problem hiding this comment.
This is how portraits are displayed. Not sure I remember the reasons for the various parameters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merging two persons with different images, show images.
The list of synonyms was not displayed (only the radio button!!)